Mercurial > emacs
changeset 101675:9c67a492eb59
* atimer.c (run_timers, alarm_signal_handler):
* keyboard.c (pending_signals, handle_async_input, init_keyboard):
* w32inevt.c (w32_console_read_socket):
* w32term.c (w32_read_socket):
* xterm.c (XTread_socket): Use "#ifdef SYNC_INPUT" where appropriate.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 30 Jan 2009 13:06:07 +0000 |
| parents | 9a79c9d87998 |
| children | 5fd0ba414a8c |
| files | src/ChangeLog src/atimer.c src/keyboard.c src/w32inevt.c src/w32term.c src/xterm.c |
| diffstat | 6 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 30 11:53:08 2009 +0000 +++ b/src/ChangeLog Fri Jan 30 13:06:07 2009 +0000 @@ -1,3 +1,11 @@ +2009-01-30 Juanma Barranquero <lekktu@gmail.com> + + * atimer.c (run_timers, alarm_signal_handler): + * keyboard.c (pending_signals, handle_async_input, init_keyboard): + * w32inevt.c (w32_console_read_socket): + * w32term.c (w32_read_socket): + * xterm.c (XTread_socket): Use "#ifdef SYNC_INPUT" where appropriate. + 2009-01-30 Chong Yidong <cyd@stupidchicken.com> * callproc.c (Vtemp_file_name_pattern): Remove DEFVAR_LISP.
--- a/src/atimer.c Fri Jan 30 11:53:08 2009 +0000 +++ b/src/atimer.c Fri Jan 30 13:06:07 2009 +0000 @@ -384,6 +384,7 @@ EMACS_GET_TIME (now); } +#ifdef SYNC_INPUT if (pending_atimers) pending_signals = 1; else @@ -391,6 +392,10 @@ pending_signals = interrupt_input_pending; set_alarm (); } +#else + if (! pending_atimers) + set_alarm (); +#endif } @@ -402,8 +407,9 @@ int signo; { pending_atimers = 1; +#ifdef SYNC_INPUT pending_signals = 1; -#ifndef SYNC_INPUT +#else run_timers (); #endif }
--- a/src/keyboard.c Fri Jan 30 11:53:08 2009 +0000 +++ b/src/keyboard.c Fri Jan 30 13:06:07 2009 +0000 @@ -96,7 +96,9 @@ pending_atimers separately, to reduce code size. So, any code that changes interrupt_input_pending or pending_atimers should update this too. */ +#ifdef SYNC_INPUT int pending_signals; +#endif #define KBD_BUFFER_SIZE 4096 @@ -7271,7 +7273,9 @@ handle_async_input () { interrupt_input_pending = 0; +#ifdef SYNC_INPUT pending_signals = pending_atimers; +#endif while (1) { @@ -11556,7 +11560,9 @@ input_pending = 0; interrupt_input_blocked = 0; interrupt_input_pending = 0; +#ifdef SYNC_INPUT pending_signals = 0; +#endif /* This means that command_loop_1 won't try to select anything the first time through. */
--- a/src/w32inevt.c Fri Jan 30 11:53:08 2009 +0000 +++ b/src/w32inevt.c Fri Jan 30 13:06:07 2009 +0000 @@ -651,12 +651,16 @@ if (interrupt_input_blocked) { interrupt_input_pending = 1; +#ifdef SYNC_INPUT pending_signals = 1; +#endif return -1; } interrupt_input_pending = 0; +#ifdef SYNC_INPUT pending_signals = pending_atimers; +#endif BLOCK_INPUT; for (;;)
--- a/src/w32term.c Fri Jan 30 11:53:08 2009 +0000 +++ b/src/w32term.c Fri Jan 30 13:06:07 2009 +0000 @@ -4078,12 +4078,16 @@ if (interrupt_input_blocked) { interrupt_input_pending = 1; +#ifdef SYNC_INPUT pending_signals = 1; +#endif return -1; } interrupt_input_pending = 0; +#ifdef SYNC_INPUT pending_signals = pending_atimers; +#endif BLOCK_INPUT; /* So people can tell when we have read the available input. */
--- a/src/xterm.c Fri Jan 30 11:53:08 2009 +0000 +++ b/src/xterm.c Fri Jan 30 13:06:07 2009 +0000 @@ -7138,12 +7138,16 @@ if (interrupt_input_blocked) { interrupt_input_pending = 1; +#ifdef SYNC_INPUT pending_signals = 1; +#endif return -1; } interrupt_input_pending = 0; +#ifdef SYNC_INPUT pending_signals = pending_atimers; +#endif BLOCK_INPUT; /* So people can tell when we have read the available input. */