diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/keyboard.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 676f4127ba5..b60027880fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-09-23 Chong Yidong <cyd@gnu.org> + + * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence. + 2012-09-22 Paul Eggert <eggert@cs.ucla.edu> * .gdbinit: Just stop at fatal_error_backtrace. diff --git a/src/keyboard.c b/src/keyboard.c index 8b1113a026a..c5a741abc10 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4496,6 +4496,9 @@ timer_check (void) Lisp_Object timers, idle_timers; struct gcpro gcpro1, gcpro2; + Lisp_Object tem = Vinhibit_quit; + Vinhibit_quit = Qt; + /* We use copies of the timers' lists to allow a timer to add itself again, without locking up Emacs if the newly added timer is already ripe when added. */ @@ -4508,6 +4511,8 @@ timer_check (void) else idle_timers = Qnil; + Vinhibit_quit = tem; + GCPRO2 (timers, idle_timers); do |