diff options
| author | Stefan Monnier | 2007-10-23 20:56:27 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-23 20:56:27 +0000 |
| commit | 7357cb0467cb329a422c857c9fd07c574968788f (patch) | |
| tree | cf632f5ae80ec9840b790582eeb9b8cd46b271a2 /src/data.c | |
| parent | 93137d491fbfca0258044e471294b971578c6d8a (diff) | |
| download | emacs-7357cb0467cb329a422c857c9fd07c574968788f.tar.gz emacs-7357cb0467cb329a422c857c9fd07c574968788f.zip | |
(Fmake_variable_buffer_local, Fmake_local_variable)
(Fmake_variable_frame_local): Just check the variable's const-ness
rather than checking nil or t.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data.c b/src/data.c index 2a99a728a76..9796b649f72 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1521,7 +1521,7 @@ The function `default-value' gets the default value and `set-default' sets it. | |||
| 1521 | variable = indirect_variable (variable); | 1521 | variable = indirect_variable (variable); |
| 1522 | 1522 | ||
| 1523 | valcontents = SYMBOL_VALUE (variable); | 1523 | valcontents = SYMBOL_VALUE (variable); |
| 1524 | if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) | 1524 | if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents)) |
| 1525 | error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); | 1525 | error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 1526 | 1526 | ||
| 1527 | if (BUFFER_OBJFWDP (valcontents)) | 1527 | if (BUFFER_OBJFWDP (valcontents)) |
| @@ -1578,7 +1578,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */) | |||
| 1578 | variable = indirect_variable (variable); | 1578 | variable = indirect_variable (variable); |
| 1579 | 1579 | ||
| 1580 | valcontents = SYMBOL_VALUE (variable); | 1580 | valcontents = SYMBOL_VALUE (variable); |
| 1581 | if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)) | 1581 | if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents)) |
| 1582 | error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); | 1582 | error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable))); |
| 1583 | 1583 | ||
| 1584 | if ((BUFFER_LOCAL_VALUEP (valcontents) | 1584 | if ((BUFFER_LOCAL_VALUEP (valcontents) |
| @@ -1733,7 +1733,7 @@ Buffer-local bindings take precedence over frame-local bindings. */) | |||
| 1733 | variable = indirect_variable (variable); | 1733 | variable = indirect_variable (variable); |
| 1734 | 1734 | ||
| 1735 | valcontents = SYMBOL_VALUE (variable); | 1735 | valcontents = SYMBOL_VALUE (variable); |
| 1736 | if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents) | 1736 | if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents) |
| 1737 | || BUFFER_OBJFWDP (valcontents)) | 1737 | || BUFFER_OBJFWDP (valcontents)) |
| 1738 | error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); | 1738 | error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable))); |
| 1739 | 1739 | ||