diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lread.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d20f13dced..484df557e6e 100644 --- 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 50465fd01e8..6b657f61ed0 100644 --- 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. */ |