summaryrefslogtreecommitdiff
path: root/src/data.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-10-23 20:56:27 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-10-23 20:56:27 +0000
commit7357cb0467cb329a422c857c9fd07c574968788f (patch)
treecf632f5ae80ec9840b790582eeb9b8cd46b271a2 /src/data.c
parent93137d491fbfca0258044e471294b971578c6d8a (diff)
downloademacs-7357cb0467cb329a422c857c9fd07c574968788f.tar.gz
(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.c6
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.
variable = indirect_variable (variable);
valcontents = SYMBOL_VALUE (variable);
- if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
+ if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents))
error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable)));
if (BUFFER_OBJFWDP (valcontents))
@@ -1578,7 +1578,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */)
variable = indirect_variable (variable);
valcontents = SYMBOL_VALUE (variable);
- if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
+ if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents))
error ("Symbol %s may not be buffer-local", SDATA (SYMBOL_NAME (variable)));
if ((BUFFER_LOCAL_VALUEP (valcontents)
@@ -1733,7 +1733,7 @@ Buffer-local bindings take precedence over frame-local bindings. */)
variable = indirect_variable (variable);
valcontents = SYMBOL_VALUE (variable);
- if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
+ if (XSYMBOL (variable)->constant || KBOARD_OBJFWDP (valcontents)
|| BUFFER_OBJFWDP (valcontents))
error ("Symbol %s may not be frame-local", SDATA (SYMBOL_NAME (variable)));