aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispnew.c
diff options
context:
space:
mode:
authorKim F. Storm2004-08-19 13:59:28 +0000
committerKim F. Storm2004-08-19 13:59:28 +0000
commitbb41f093dde33efca8a7d5baf6eb1c364ea684c4 (patch)
tree0db113834c43767ef2f213cbf6e5081b131aa054 /src/dispnew.c
parentb89a415ab18b6ed14f70518d8bd336d1f3364c9c (diff)
downloademacs-bb41f093dde33efca8a7d5baf6eb1c364ea684c4.tar.gz
emacs-bb41f093dde33efca8a7d5baf6eb1c364ea684c4.zip
Adapt to new wait_reading_process_input args.
Diffstat (limited to 'src/dispnew.c')
-rw-r--r--src/dispnew.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 8a713857273..0d2ce118e0f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6331,12 +6331,7 @@ Emacs was built without floating point support.
6331 if (sec < 0 || (sec == 0 && usec == 0)) 6331 if (sec < 0 || (sec == 0 && usec == 0))
6332 return Qnil; 6332 return Qnil;
6333 6333
6334 { 6334 wait_reading_process_input (sec, usec, 0, 0, Qnil, NULL, 0);
6335 Lisp_Object zero;
6336
6337 XSETFASTINT (zero, 0);
6338 wait_reading_process_input (sec, usec, zero, 0);
6339 }
6340 6335
6341 /* We should always have wait_reading_process_input; we have a dummy 6336 /* We should always have wait_reading_process_input; we have a dummy
6342 implementation for systems which don't support subprocesses. */ 6337 implementation for systems which don't support subprocesses. */
@@ -6386,8 +6381,6 @@ Lisp_Object
6386sit_for (sec, usec, reading, display, initial_display) 6381sit_for (sec, usec, reading, display, initial_display)
6387 int sec, usec, reading, display, initial_display; 6382 int sec, usec, reading, display, initial_display;
6388{ 6383{
6389 Lisp_Object read_kbd;
6390
6391 swallow_events (display); 6384 swallow_events (display);
6392 6385
6393 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro)) 6386 if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
@@ -6403,8 +6396,8 @@ sit_for (sec, usec, reading, display, initial_display)
6403 gobble_input (0); 6396 gobble_input (0);
6404#endif 6397#endif
6405 6398
6406 XSETINT (read_kbd, reading ? -1 : 1); 6399 wait_reading_process_input (sec, usec, reading ? -1 : 1, display,
6407 wait_reading_process_input (sec, usec, read_kbd, display); 6400 Qnil, NULL, 0);
6408 6401
6409 return detect_input_pending () ? Qnil : Qt; 6402 return detect_input_pending () ? Qnil : Qt;
6410} 6403}