aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorEli Zaretskii2001-04-21 19:52:11 +0000
committerEli Zaretskii2001-04-21 19:52:11 +0000
commit78c1afb68183b2b13cbbdf4af2aa30bfc782d16a (patch)
treef12454bdf280d004cb862f2424f7d7873083d855 /src/process.c
parent7824c16b54cbbbf8499aac57c497430b7d2f736f (diff)
downloademacs-78c1afb68183b2b13cbbdf4af2aa30bfc782d16a.tar.gz
emacs-78c1afb68183b2b13cbbdf4af2aa30bfc782d16a.zip
(wait_reading_process_input) [!subprocesses]: Don't
reference waiting_for_user_input_p, it's not defined in the branch without async subprocesses support.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c24
1 files changed, 5 insertions, 19 deletions
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)
4916 4916
4917 /* Check for keyboard input */ 4917 /* Check for keyboard input */
4918 4918
4919 if (XINT (read_kbd) != 0) 4919 if ((XINT (read_kbd) != 0)
4920 && detect_input_pending_run_timers (do_display))
4920 { 4921 {
4921 int old_timers_run = timers_run; 4922 swallow_events (do_display);
4922 int leave = 0;
4923
4924 if (detect_input_pending_run_timers (do_display)) 4923 if (detect_input_pending_run_timers (do_display))
4925 {
4926 swallow_events (do_display);
4927 if (detect_input_pending_run_timers (do_display))
4928 leave = 1;
4929 }
4930
4931 /* If a timer has run, this might have changed buffers
4932 an alike. Make read_key_sequence aware of that. */
4933 if (timers_run != old_timers_run
4934 && waiting_for_user_input_p == -1)
4935 record_asynch_buffer_change ();
4936
4937 if (leave)
4938 break; 4924 break;
4939 } 4925 }
4940 4926
4941 /* If there is unread keyboard input, also return. */ 4927 /* If there is unread keyboard input, also return. */
4942 if (XINT (read_kbd) != 0 4928 if (XINT (read_kbd) != 0
4943 && requeued_events_pending_p ()) 4929 && requeued_events_pending_p ())