* src/lread.c (init_obarray): Declare Qt and Qnil as special.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d20f13dced917b0b1ca5a6c5df97bb8cc87e307..484df557e6e0f2702bbd103c4d2f350c09dc0008 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * lread.c (init_obarray): Declare Qt and Qnil as special.
+
 2012-05-14  Glenn Morris  <rgm@gnu.org>
 
        * nsterm.m (ns_init_paths): Fix typo ("libexec" not "lib-exec").

diff --git a/src/lread.c b/src/lread.c
index 50465fd01e832d6e8202152d7c412a234cd95887..6b657f61ed0a946768ad121e5c6a660d56f9a21b 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <errno.h>
-#include <limits.h>    /* for CHAR_BIT */
+#include <limits.h>    /* For CHAR_BIT.  */
 #include <setjmp.h>
 #include "lisp.h"
 #include "intervals.h"
@@ -3990,10 +3990,12 @@ init_obarray (void)
   /* XSYMBOL (Qnil)->function = Qunbound; */
   SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil);
   XSYMBOL (Qnil)->constant = 1;
+  XSYMBOL (Qnil)->declared_special = 1;
   XSYMBOL (Qnil)->plist = Qnil;
 
   Qt = intern_c_string ("t");
   SET_SYMBOL_VAL (XSYMBOL (Qt), Qt);
+  XSYMBOL (Qnil)->declared_special = 1;
   XSYMBOL (Qt)->constant = 1;
 
   /* Qt is correct even if CANNOT_DUMP.  loadup.el will set to nil at end.  */