[Emacs-diffs] /srv/bzr/emacs/trunk r108247: * src/lread.c (init_obarray): Declare Qt and Qnil as special.

[Stefan Monnier]

------------------------------------------------------------
revno: 108247
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-15 16:20:18 -0400
message:
  * src/lread.c (init_obarray): Declare Qt and Qnil as special.
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-14 16:33:11 +0000
+++ b/src/ChangeLog     2012-05-15 20:20:18 +0000
@@ -1,3 +1,7 @@
+2012-05-15  Stefan Monnier  <address@hidden>
+
+       * lread.c (init_obarray): Declare Qt and Qnil as special.
+
 2012-05-14  Glenn Morris  <address@hidden>
 
        * nsterm.m (ns_init_paths): Fix typo ("libexec" not "lib-exec").

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-04-14 01:46:06 +0000
+++ b/src/lread.c       2012-05-15 20:20:18 +0000
@@ -24,7 +24,7 @@
 #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 @@
   /* 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.  */