2 files changed, 11 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 16ed4171305..75a087c1c5a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * process.c (wait_reading_process_input) [!subprocesses]: Don't
+        reference waiting_for_user_input_p, it's not defined in the branch
+        without async subprocesses support.
+
 2001-04-19  Gerd Moellmann  <gerd@gnu.org>
 
         * keyboard.c (delete_kboard): Prevent a dangling reference
diff --git a/src/process.c b/src/process.c
index 35e67c45f9e..15fc26c6634 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4916,28 +4916,14 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
 
       /* Check for keyboard input */
 
-      if (XINT (read_kbd) != 0)
+      if ((XINT (read_kbd) != 0)
+          && detect_input_pending_run_timers (do_display))
         {
-          int old_timers_run = timers_run;
-          int leave = 0;
-        
+          swallow_events (do_display);
           if (detect_input_pending_run_timers (do_display))
-            {
-              swallow_events (do_display);
-              if (detect_input_pending_run_timers (do_display))
-                leave = 1;
-            }
-
-          /* If a timer has run, this might have changed buffers
-             an alike.  Make read_key_sequence aware of that.  */
-          if (timers_run != old_timers_run
-              && waiting_for_user_input_p == -1)
-            record_asynch_buffer_change ();
-
-          if (leave)
             break;
-        }    
-      
+        }
+
       /* If there is unread keyboard input, also return.  */
       if (XINT (read_kbd) != 0
           && requeued_events_pending_p ())