aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-12-16 14:49:14 -0800
committerPaul Eggert2014-12-16 14:50:01 -0800
commit005b86c0d061dab4279c74c45368a557733433a1 (patch)
tree2034b9a496165a2a4c314c1ee214ca6061c3e2fa /src
parent0a3e2cfcbbf09abe6a550eeb1620a66a8e3d0245 (diff)
downloademacs-005b86c0d061dab4279c74c45368a557733433a1.tar.gz
emacs-005b86c0d061dab4279c74c45368a557733433a1.zip
* lread.c (init_obarray): Declare Qt as special.
This fixes a typo in the 2012-05-15 patch that tried to declare Qt as special.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/lread.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 596ae25c649..aa8adabfede 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12014-12-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 * lread.c (init_obarray): Declare Qt as special.
4 This fixes a typo in the 2012-05-15 patch that
5 tried to declare Qt as special.
6
12014-12-15 Stefan Monnier <monnier@iro.umontreal.ca> 72014-12-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 Various fixes to use bool type and constants. 9 Various fixes to use bool type and constants.
diff --git a/src/lread.c b/src/lread.c
index 6f71ff5f468..afa47aafb86 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4072,14 +4072,14 @@ init_obarray (void)
4072 set_symbol_plist (Qunbound, Qnil); 4072 set_symbol_plist (Qunbound, Qnil);
4073 SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil); 4073 SET_SYMBOL_VAL (XSYMBOL (Qnil), Qnil);
4074 XSYMBOL (Qnil)->constant = 1; 4074 XSYMBOL (Qnil)->constant = 1;
4075 XSYMBOL (Qnil)->declared_special = 1; 4075 XSYMBOL (Qnil)->declared_special = true;
4076 set_symbol_plist (Qnil, Qnil); 4076 set_symbol_plist (Qnil, Qnil);
4077 set_symbol_function (Qnil, Qnil); 4077 set_symbol_function (Qnil, Qnil);
4078 4078
4079 Qt = intern_c_string ("t"); 4079 Qt = intern_c_string ("t");
4080 SET_SYMBOL_VAL (XSYMBOL (Qt), Qt); 4080 SET_SYMBOL_VAL (XSYMBOL (Qt), Qt);
4081 XSYMBOL (Qnil)->declared_special = 1;
4082 XSYMBOL (Qt)->constant = 1; 4081 XSYMBOL (Qt)->constant = 1;
4082 XSYMBOL (Qt)->declared_special = true;
4083 4083
4084 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */ 4084 /* Qt is correct even if CANNOT_DUMP. loadup.el will set to nil at end. */
4085 Vpurify_flag = Qt; 4085 Vpurify_flag = Qt;