summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2003-02-24 07:58:51 +0000
committerJuanma Barranquero <lekktu@gmail.com>2003-02-24 07:58:51 +0000
commit0b063c2762130d90ceb766b9753339fc62539082 (patch)
treeb650fe015393feb2c0dd9a0b5733c9c5ff9e7fdd
parent3d1dcd520fb6ac93e571ab487ad93ddb9ecb4a4d (diff)
downloademacs-0b063c2762130d90ceb766b9753339fc62539082.tar.gz
(Qwhen): Declare external; it's now defined in callint.c.
(syms_of_xdisp): Don't initialize Qwhen.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/xdisp.c5
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3e056ced267..a3f5d91d77a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-24 Juanma Barranquero <lektu@terra.es>
+
+ * xdisp.c (Qwhen): Declare external; it's now defined in callint.c.
+ (syms_of_xdisp): Don't initialize Qwhen.
+
2003-02-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* keyboard.c (cancel_hourglass_unwind): New function.
@@ -10,7 +15,7 @@
(Fcall_interactively): Call fix_command.
(Qif, Qwhen): New variables.
(syms_of_callint): Init and staticpro them.
-
+
* regex.c (print_partial_compiled_pattern): Output to stderr.
2003-02-23 Kai Gro,A_(Bjohann <kai.grossjohann@uni-duisburg.de>
diff --git a/src/xdisp.c b/src/xdisp.c
index 5da63f2f407..f9ad45445d4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -218,12 +218,13 @@ extern Lisp_Object Qmode_line, Qmode_line_inactive, Qheader_line;
extern Lisp_Object Voverriding_local_map;
extern Lisp_Object Voverriding_local_map_menu_flag;
extern Lisp_Object Qmenu_item;
+extern Lisp_Object Qwhen;
Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
Lisp_Object Qredisplay_end_trigger_functions;
Lisp_Object Qinhibit_point_motion_hooks;
-Lisp_Object QCeval, Qwhen, QCfile, QCdata, QCpropertize;
+Lisp_Object QCeval, QCfile, QCdata, QCpropertize;
Lisp_Object Qfontified;
Lisp_Object Qgrow_only;
Lisp_Object Qinhibit_eval_during_redisplay;
@@ -15658,8 +15659,6 @@ syms_of_xdisp ()
staticpro (&QCeval);
QCpropertize = intern (":propertize");
staticpro (&QCpropertize);
- Qwhen = intern ("when");
- staticpro (&Qwhen);
QCfile = intern (":file");
staticpro (&QCfile);
Qfontified = intern ("fontified");