[Emacs-diffs] emacs/src atimer.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/01/29 14:33:14

Modified files:
        src            : atimer.c 

Log message:
        (run_timers, alarm_signal_handler): Update pending_signals.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/atimer.c?cvsroot=emacs&r1=1.29&r2=1.30

Patches:
Index: atimer.c
===================================================================
RCS file: /sources/emacs/emacs/src/atimer.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- atimer.c    8 Jan 2009 03:15:24 -0000       1.29
+++ atimer.c    29 Jan 2009 14:33:14 -0000      1.30
@@ -384,8 +384,13 @@
       EMACS_GET_TIME (now);
     }
 
-  if (! pending_atimers)
+  if (pending_atimers)
+    pending_signals = 1;
+  else
+    {
+      pending_signals = interrupt_input_pending;
     set_alarm ();
+    }
 }
 
 
@@ -397,6 +402,7 @@
      int signo;
 {
   pending_atimers = 1;
+  pending_signals = 1;
 #ifndef SYNC_INPUT
   run_timers ();
 #endif
@@ -439,6 +445,7 @@
 {
   free_atimers = atimers = NULL;
   pending_atimers = 0;
+  /* pending_signals is initialized in init_keyboard.*/
   signal (SIGALRM, alarm_signal_handler);
 }