aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1998-04-12 06:41:01 +0000
committerKarl Heuer1998-04-12 06:41:01 +0000
commit120821e11c6d9f81288ab8b00b779b7370179b94 (patch)
tree1811188b251e0c8d52d91042d47c534e2146e82c /src
parentad61e7bc2585a6673cc673ecf903b37bfd818fbf (diff)
downloademacs-120821e11c6d9f81288ab8b00b779b7370179b94.tar.gz
emacs-120821e11c6d9f81288ab8b00b779b7370179b94.zip
(set_internal, Fmakunbound): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/data.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/data.c b/src/data.c
index 0eb415e978b..7daf6716986 100644
--- a/src/data.c
+++ b/src/data.c
@@ -617,8 +617,7 @@ DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, "Make SYMBOL's value be
617 CHECK_SYMBOL (symbol, 0); 617 CHECK_SYMBOL (symbol, 0);
618 if (NILP (symbol) || EQ (symbol, Qt) 618 if (NILP (symbol) || EQ (symbol, Qt)
619 || (XSYMBOL (symbol)->name->data[0] == ':' 619 || (XSYMBOL (symbol)->name->data[0] == ':'
620 && keyword_symbols_constant_flag 620 && keyword_symbols_constant_flag))
621 && ! EQ (XSYMBOL (symbol)->value, symbol)))
622 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); 621 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
623 Fset (symbol, Qunbound); 622 Fset (symbol, Qunbound);
624 return symbol; 623 return symbol;
@@ -969,8 +968,7 @@ set_internal (symbol, newval, bindflag)
969 CHECK_SYMBOL (symbol, 0); 968 CHECK_SYMBOL (symbol, 0);
970 if (NILP (symbol) || EQ (symbol, Qt) 969 if (NILP (symbol) || EQ (symbol, Qt)
971 || (XSYMBOL (symbol)->name->data[0] == ':' 970 || (XSYMBOL (symbol)->name->data[0] == ':'
972 && keyword_symbols_constant_flag 971 && keyword_symbols_constant_flag && ! EQ (newval, symbol)))
973 && ! EQ (XSYMBOL (symbol)->value, symbol)))
974 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil)); 972 return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
975 valcontents = XSYMBOL (symbol)->value; 973 valcontents = XSYMBOL (symbol)->value;
976 974