[Emacs-diffs] /srv/bzr/emacs/trunk r110150: * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence.

[Chong Yidong]

------------------------------------------------------------
revno: 110150
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-23 16:24:44 +0800
message:
  * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-22 20:35:46 +0000
+++ b/src/ChangeLog     2012-09-23 08:24:44 +0000
@@ -1,3 +1,7 @@
+2012-09-23  Chong Yidong  <address@hidden>
+
+       * keyboard.c (timer_check): Avoid quitting during Fcopy_sequence.
+
 2012-09-22  Paul Eggert  <address@hidden>
 
        * .gdbinit: Just stop at fatal_error_backtrace.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-09-22 13:16:03 +0000
+++ b/src/keyboard.c    2012-09-23 08:24:44 +0000
@@ -4496,6 +4496,9 @@
   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 @@
   else
     idle_timers = Qnil;
 
+  Vinhibit_quit = tem;
+
   GCPRO2 (timers, idle_timers);
 
   do