Mercurial > emacs
changeset 18492:668304de6f92
(wait_reading_process_input): If wait_for_cell,
do check for keyboard input and swallow events, just don't exit.
(max): New macro.
(wait_reading_process_input): Pass a smaller first arg to select.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 29 Jun 1997 00:34:36 +0000 |
| parents | bf0d449581c8 |
| children | d65021d5c39e |
| files | src/process.c |
| diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/process.c Sun Jun 29 00:33:39 1997 +0000 +++ b/src/process.c Sun Jun 29 00:34:36 1997 +0000 @@ -107,6 +107,8 @@ #include "frame.h" #include "blockinput.h" +#define max(a, b) ((a) > (b) ? (a) : (b)) + Lisp_Object Qprocessp; Lisp_Object Qrun, Qstop, Qsignal, Qopen, Qclosed; Lisp_Object Qlast_nonmenu_event; @@ -2288,7 +2290,8 @@ { Atemp = input_wait_mask; EMACS_SET_SECS_USECS (timeout, 0, 0); - if ((select (MAXDESC, &Atemp, (SELECT_TYPE *)0, (SELECT_TYPE *)0, + if ((select (max (max_process_desc, max_keyboard_desc) + 1, + &Atemp, (SELECT_TYPE *)0, (SELECT_TYPE *)0, &timeout) <= 0)) { @@ -2349,7 +2352,8 @@ FD_ZERO (&Available); } else - nfds = select (MAXDESC, &Available, (SELECT_TYPE *)0, (SELECT_TYPE *)0, + nfds = select (max (max_process_desc, max_keyboard_desc) + 1, + &Available, (SELECT_TYPE *)0, (SELECT_TYPE *)0, &timeout); xerrno = errno; @@ -2445,21 +2449,20 @@ && requeued_events_pending_p ()) break; -#if 0 /* If wait_for_cell. check for keyboard input but don't run any timers. - ??? (It seems wrong to me to check for keyboard - input at all when wait_for_cell, but the code - has been this way since July 1994. - Try changing this after version 19.31.) */ + The reason for this is so that X events will be processed. + Otherwise they may have to wait until polling takes place. + That would causes delays in pasting selections, for example. */ if (wait_for_cell && detect_input_pending ()) { swallow_events (do_display); +#if 0 /* Exiting when read_kbd doesn't request that seems wrong, though. */ if (detect_input_pending ()) break; +#endif } -#endif /* Exit now if the cell we're waiting for became non-nil. */ if (wait_for_cell && ! NILP (*wait_for_cell))