Mercurial > emacs
changeset 56729:e6e0caa7ec87
Rename wait_reading_process_input to wait_reading_process_output.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Fri, 20 Aug 2004 10:34:12 +0000 |
parents | 1686b397ef16 |
children | a00d573807f9 |
files | src/keyboard.c src/lisp.h src/msdos.c src/w32proc.c src/w32term.c src/xdisp.c src/xselect.c src/xterm.c |
diffstat | 8 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/keyboard.c Fri Aug 20 10:34:12 2004 +0000 @@ -3899,7 +3899,7 @@ break; #endif { - wait_reading_process_input (0, 0, -1, 1, Qnil, NULL, 0); + wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0); if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr) /* Pass 1 for EXPECT since we just waited to have input. */ @@ -9917,7 +9917,7 @@ } /* Return nonzero if there are pending requeued events. - This isn't used yet. The hope is to make wait_reading_process_input + This isn't used yet. The hope is to make wait_reading_process_output call it, and return if it runs Lisp code that unreads something. The problem is, kbd_buffer_get_event needs to be fixed to know what to do in that case. It isn't trivial. */
--- a/src/lisp.h Fri Aug 20 10:33:25 2004 +0000 +++ b/src/lisp.h Fri Aug 20 10:34:12 2004 +0000 @@ -2964,10 +2964,10 @@ EXFUN (Fwaiting_for_user_input_p, 0); extern Lisp_Object Qprocessp; extern void kill_buffer_processes P_ ((Lisp_Object)); -extern int wait_reading_process_input P_ ((int, int, int, int, - Lisp_Object, - struct Lisp_Process *, - int)); +extern int wait_reading_process_output P_ ((int, int, int, int, + Lisp_Object, + struct Lisp_Process *, + int)); extern void deactivate_process P_ ((Lisp_Object)); extern void add_keyboard_wait_descriptor P_ ((int)); extern void delete_keyboard_wait_descriptor P_ ((int));
--- a/src/msdos.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/msdos.c Fri Aug 20 10:34:12 2004 +0000 @@ -5102,7 +5102,7 @@ /* Only event queue is checked. */ /* We don't have to call timer_check here - because wait_reading_process_input takes care of that. */ + because wait_reading_process_output takes care of that. */ int sys_select (nfds, rfds, wfds, efds, timeout) int nfds;
--- a/src/w32proc.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/w32proc.c Fri Aug 20 10:34:12 2004 +0000 @@ -1218,7 +1218,7 @@ { DebPrint (("select.WaitForMultipleObjects (%d, %lu) failed with %lu\n", nh + nc, timeout_ms, GetLastError ())); - /* don't return EBADF - this causes wait_reading_process_input to + /* don't return EBADF - this causes wait_reading_process_output to abort; WAIT_FAILED is returned when single-stepping under Windows 95 after switching thread focus in debugger, and possibly at other times. */
--- a/src/w32term.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/w32term.c Fri Aug 20 10:34:12 2004 +0000 @@ -4570,7 +4570,7 @@ f->async_visible = 1; f->async_iconified = 0; - /* wait_reading_process_input will notice this and update + /* wait_reading_process_output will notice this and update the frame's display structures. */ SET_FRAME_GARBAGED (f);
--- a/src/xdisp.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/xdisp.c Fri Aug 20 10:34:12 2004 +0000 @@ -10381,7 +10381,7 @@ This is useful in situations where you need to redisplay but no user action has occurred, making it inappropriate for the message area to be cleared. See tracking_off and - wait_reading_process_input for examples of these situations. + wait_reading_process_output for examples of these situations. FROM_WHERE is an integer saying from where this function was called. This is useful for debugging. */
--- a/src/xselect.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/xselect.c Fri Aug 20 10:34:12 2004 +0000 @@ -1109,8 +1109,8 @@ secs = x_selection_timeout / 1000; usecs = (x_selection_timeout % 1000) * 1000; TRACE2 (" Waiting %d secs, %d usecs", secs, usecs); - wait_reading_process_input (secs, usecs, 0, 0, - property_change_reply, NULL, 0); + wait_reading_process_output (secs, usecs, 0, 0, + property_change_reply, NULL, 0); if (NILP (XCAR (property_change_reply))) { @@ -1289,8 +1289,8 @@ secs = x_selection_timeout / 1000; usecs = (x_selection_timeout % 1000) * 1000; TRACE1 (" Start waiting %d secs for SelectionNotify", secs); - wait_reading_process_input (secs, usecs, 0, 0, - reading_selection_reply, NULL, 0); + wait_reading_process_output (secs, usecs, 0, 0, + reading_selection_reply, NULL, 0); TRACE1 (" Got event = %d", !NILP (XCAR (reading_selection_reply))); BLOCK_INPUT;
--- a/src/xterm.c Fri Aug 20 10:33:25 2004 +0000 +++ b/src/xterm.c Fri Aug 20 10:34:12 2004 +0000 @@ -6174,7 +6174,7 @@ f = x_top_window_to_frame (dpyinfo, event.xmap.window); if (f) { - /* wait_reading_process_input will notice this and update + /* wait_reading_process_output will notice this and update the frame's display structures. If we where iconified, we should not set garbaged, because that stops redrawing on Expose events. This looks