aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2009-05-06 01:30:13 +0000
committerStefan Monnier2009-05-06 01:30:13 +0000
commit864660a2ca320808be5d03cd67e3a170aeef5922 (patch)
tree4e1ca50938bc3594cd0885ea72b277b64e2fcdcd
parente6c01f094deddf0e8205e19cb5ea283fff7143f3 (diff)
downloademacs-864660a2ca320808be5d03cd67e3a170aeef5922.tar.gz
emacs-864660a2ca320808be5d03cd67e3a170aeef5922.zip
(syms_of_keyboard): Staticpro pending_funcalls.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7f29736d394..b8e23d74d41 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * keyboard.c (syms_of_keyboard): Staticpro pending_funcalls.
4
12009-05-04 Stefan Monnier <monnier@iro.umontreal.ca> 52009-05-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * Makefile.in (ctagsfiles1, ctagsfiles2): Include ObjC files in TAGS. 7 * Makefile.in (ctagsfiles1, ctagsfiles2): Include ObjC files in TAGS.
diff --git a/src/keyboard.c b/src/keyboard.c
index 4a19457d49f..c47bf86fe2b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4491,7 +4491,7 @@ struct input_event last_timer_event;
4491 4491
4492/* List of elisp functions to call, delayed because they were generated in 4492/* List of elisp functions to call, delayed because they were generated in
4493 a context where Elisp could not be safely run (e.g. redisplay, signal, 4493 a context where Elisp could not be safely run (e.g. redisplay, signal,
4494 ...). Each lement has the form (FUN . ARGS). */ 4494 ...). Each element has the form (FUN . ARGS). */
4495Lisp_Object pending_funcalls; 4495Lisp_Object pending_funcalls;
4496 4496
4497extern Lisp_Object Qapply; 4497extern Lisp_Object Qapply;
@@ -11711,6 +11711,7 @@ void
11711syms_of_keyboard () 11711syms_of_keyboard ()
11712{ 11712{
11713 pending_funcalls = Qnil; 11713 pending_funcalls = Qnil;
11714 staticpro (&pending_funcalls);
11714 11715
11715 Vlispy_mouse_stem = build_string ("mouse"); 11716 Vlispy_mouse_stem = build_string ("mouse");
11716 staticpro (&Vlispy_mouse_stem); 11717 staticpro (&Vlispy_mouse_stem);