(wait_reading_process_output): If SYNC_INPUT and pending_atimers, run atimers.

2 files changed, 18 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 918b914b076..179fcadfc21 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2008-04-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * atimer.c (alarm_signal_handler): Call run_timers if not SYNC_INPUT.
+        Most of the code moved to run_timers.
+        (do_pending_atimers): Call run_timers.
+        (run_timers): New function.
+
+        * sysdep.c (emacs_write): If SYNC_INPUT and pending_atimers, run atimers.
+
+        * process.c (wait_reading_process_output): The same as above.
+
 2008-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuf.c (last_exact_completion): Remove variable.
diff --git a/src/process.c b/src/process.c
index c3dfd59eeb5..3acf7d35e80 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4309,8 +4309,13 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
       if (read_kbd >= 0)
         QUIT;
 #ifdef SYNC_INPUT
-      else if (interrupt_input_pending)
-        handle_async_input ();
+      else
+        {
+          if (interrupt_input_pending)
+            handle_async_input ();
+          if (pending_atimers)
+            do_pending_atimers ();
+        }
 #endif
 
       /* Exit now if the cell we're waiting for became non-nil.  */