From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 26 Apr 1998 19:16:25 +0000 (+0000)
Subject: (Fmakunbound): Test keywordness only in initial obarray.
X-Git-Tag: emacs-20.3~1301
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=454fa457655175a3458f5a7c4ef00222eeb97416;p=emacs.git

(Fmakunbound): Test keywordness only in initial obarray.
(set_internal): Test keywordness only in initial obarray.
---

diff --git a/src/data.c b/src/data.c
index c9493c05711..18354046210 100644
--- a/src/data.c
+++ b/src/data.c
@@ -618,6 +618,7 @@ DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0, "Make SYMBOL's value be
   CHECK_SYMBOL (symbol, 0);
   if (NILP (symbol) || EQ (symbol, Qt)
       || (XSYMBOL (symbol)->name->data[0] == ':'
+	  && XSYMBOL (symbol)->obarray == initial_obarray
 	  && keyword_symbols_constant_flag))
     return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
   Fset (symbol, Qunbound);
@@ -969,6 +970,7 @@ set_internal (symbol, newval, bindflag)
   CHECK_SYMBOL (symbol, 0);
   if (NILP (symbol) || EQ (symbol, Qt)
       || (XSYMBOL (symbol)->name->data[0] == ':'
+	  && XSYMBOL (symbol)->obarray == initial_obarray
 	  && keyword_symbols_constant_flag && ! EQ (newval, symbol)))
     return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
   valcontents = XSYMBOL (symbol)->value;