From: Karl Heuer <kwzh@gnu.org>
Date: Sat, 11 Apr 1998 18:04:12 +0000 (+0000)
Subject: (set_internal, Fmakunbound): No error if setting
X-Git-Tag: emacs-20.3~1600
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b087d86605483b87d1e6f02d9b87c459a23be4e1;p=emacs.git

(set_internal, Fmakunbound): No error if setting
a keyword to itself.
---

diff --git a/src/data.c b/src/data.c
index 5b3a33bddfa..0eb415e978b 100644
--- a/src/data.c
+++ b/src/data.c
@@ -617,7 +617,8 @@ 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] == ':'
-	  && keyword_symbols_constant_flag))
+	  && keyword_symbols_constant_flag
+	  && ! EQ (XSYMBOL (symbol)->value, symbol)))
     return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
   Fset (symbol, Qunbound);
   return symbol;
@@ -968,7 +969,8 @@ set_internal (symbol, newval, bindflag)
   CHECK_SYMBOL (symbol, 0);
   if (NILP (symbol) || EQ (symbol, Qt)
       || (XSYMBOL (symbol)->name->data[0] == ':'
-	  && keyword_symbols_constant_flag))
+	  && keyword_symbols_constant_flag
+	  && ! EQ (XSYMBOL (symbol)->value, symbol)))
     return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
   valcontents = XSYMBOL (symbol)->value;