[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispnew.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispnew.c [lexbind] |
Date: |
Sat, 04 Sep 2004 05:47:53 -0400 |
Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.308.2.10 emacs/src/dispnew.c:1.308.2.11
*** emacs/src/dispnew.c:1.308.2.10 Fri Jul 23 04:42:22 2004
--- emacs/src/dispnew.c Sat Sep 4 09:26:24 2004
***************
*** 6331,6382 ****
if (sec < 0 || (sec == 0 && usec == 0))
return Qnil;
! {
! Lisp_Object zero;
!
! XSETFASTINT (zero, 0);
! wait_reading_process_input (sec, usec, zero, 0);
! }
!
! /* We should always have wait_reading_process_input; we have a dummy
! implementation for systems which don't support subprocesses. */
! #if 0
! /* No wait_reading_process_input */
! immediate_quit = 1;
! QUIT;
!
! #ifdef VMS
! sys_sleep (sec);
! #else /* not VMS */
! /* The reason this is done this way
! (rather than defined (H_S) && defined (H_T))
! is because the VMS preprocessor doesn't grok `defined'. */
! #ifdef HAVE_SELECT
! EMACS_GET_TIME (end_time);
! EMACS_SET_SECS_USECS (timeout, sec, usec);
! EMACS_ADD_TIME (end_time, end_time, timeout);
!
! while (1)
! {
! EMACS_GET_TIME (timeout);
! EMACS_SUB_TIME (timeout, end_time, timeout);
! if (EMACS_TIME_NEG_P (timeout)
! || !select (1, 0, 0, 0, &timeout))
! break;
! }
! #else /* not HAVE_SELECT */
! sleep (sec);
! #endif /* HAVE_SELECT */
! #endif /* not VMS */
!
! immediate_quit = 0;
! #endif /* no subprocesses */
return Qnil;
}
! /* This is just like wait_reading_process_input, except that
it does the redisplay.
It's also much like Fsit_for, except that it can be used for
--- 6331,6343 ----
if (sec < 0 || (sec == 0 && usec == 0))
return Qnil;
! wait_reading_process_output (sec, usec, 0, 0, Qnil, NULL, 0);
return Qnil;
}
! /* This is just like wait_reading_process_output, except that
it does the redisplay.
It's also much like Fsit_for, except that it can be used for
***************
*** 6386,6393 ****
sit_for (sec, usec, reading, display, initial_display)
int sec, usec, reading, display, initial_display;
{
- Lisp_Object read_kbd;
-
swallow_events (display);
if (detect_input_pending_run_timers (display) || !NILP (Vexecuting_macro))
--- 6347,6352 ----
***************
*** 6403,6410 ****
gobble_input (0);
#endif
! XSETINT (read_kbd, reading ? -1 : 1);
! wait_reading_process_input (sec, usec, read_kbd, display);
return detect_input_pending () ? Qnil : Qt;
}
--- 6362,6369 ----
gobble_input (0);
#endif
! wait_reading_process_output (sec, usec, reading ? -1 : 1, display,
! Qnil, NULL, 0);
return detect_input_pending () ? Qnil : Qt;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/dispnew.c [lexbind],
Miles Bader <=