[Emacs-diffs] Changes to emacs/src/keyboard.c,v

[Chong Yidong]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/08/14 18:32:23

Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -b -r1.866 -r1.867
--- keyboard.c  10 Aug 2006 06:07:15 -0000      1.866
+++ keyboard.c  14 Aug 2006 18:32:23 -0000      1.867
@@ -2679,6 +2679,13 @@
       goto non_reread;
     }
 
+  /* Start idle timers.  If a time limit is supplied, we don't reset
+     idle timers.  This avoids an infinite recursion in case an idle
+     timer calls `sit-for'.  */
+
+  if (end_time)
+    timer_resume_idle ();
+  else
   timer_start_idle ();
 
   /* If in middle of key sequence and minibuffer not active,
@@ -2879,6 +2886,9 @@
       /* Actually read a character, waiting if necessary.  */
       save_getcjmp (save_jump);
       restore_getcjmp (local_getcjmp);
+      if (end_time)
+       timer_resume_idle ();
+      else
       timer_start_idle ();
       c = kbd_buffer_get_event (&kb, used_mouse_menu, end_time);
       restore_getcjmp (save_jump);