aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c4
-rw-r--r--src/lisp.h8
-rw-r--r--src/msdos.c2
-rw-r--r--src/w32proc.c2
-rw-r--r--src/w32term.c2
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xselect.c8
-rw-r--r--src/xterm.c2
8 files changed, 15 insertions, 15 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 77b3886d809..78e7498287e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3899,7 +3899,7 @@ kbd_buffer_get_event (kbp, used_mouse_menu)
3899 break; 3899 break;
3900#endif 3900#endif
3901 { 3901 {
3902 wait_reading_process_input (0, 0, -1, 1, Qnil, NULL, 0); 3902 wait_reading_process_output (0, 0, -1, 1, Qnil, NULL, 0);
3903 3903
3904 if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr) 3904 if (!interrupt_input && kbd_fetch_ptr == kbd_store_ptr)
3905 /* Pass 1 for EXPECT since we just waited to have input. */ 3905 /* Pass 1 for EXPECT since we just waited to have input. */
@@ -9917,7 +9917,7 @@ clear_input_pending ()
9917} 9917}
9918 9918
9919/* Return nonzero if there are pending requeued events. 9919/* Return nonzero if there are pending requeued events.
9920 This isn't used yet. The hope is to make wait_reading_process_input 9920 This isn't used yet. The hope is to make wait_reading_process_output
9921 call it, and return if it runs Lisp code that unreads something. 9921 call it, and return if it runs Lisp code that unreads something.
9922 The problem is, kbd_buffer_get_event needs to be fixed to know what 9922 The problem is, kbd_buffer_get_event needs to be fixed to know what
9923 to do in that case. It isn't trivial. */ 9923 to do in that case. It isn't trivial. */
diff --git a/src/lisp.h b/src/lisp.h
index e4fd7ef2c16..7e1e122fbc2 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2964,10 +2964,10 @@ EXFUN (Fprocess_send_eof, 1);
2964EXFUN (Fwaiting_for_user_input_p, 0); 2964EXFUN (Fwaiting_for_user_input_p, 0);
2965extern Lisp_Object Qprocessp; 2965extern Lisp_Object Qprocessp;
2966extern void kill_buffer_processes P_ ((Lisp_Object)); 2966extern void kill_buffer_processes P_ ((Lisp_Object));
2967extern int wait_reading_process_input P_ ((int, int, int, int, 2967extern int wait_reading_process_output P_ ((int, int, int, int,
2968 Lisp_Object, 2968 Lisp_Object,
2969 struct Lisp_Process *, 2969 struct Lisp_Process *,
2970 int)); 2970 int));
2971extern void deactivate_process P_ ((Lisp_Object)); 2971extern void deactivate_process P_ ((Lisp_Object));
2972extern void add_keyboard_wait_descriptor P_ ((int)); 2972extern void add_keyboard_wait_descriptor P_ ((int));
2973extern void delete_keyboard_wait_descriptor P_ ((int)); 2973extern void delete_keyboard_wait_descriptor P_ ((int));
diff --git a/src/msdos.c b/src/msdos.c
index 2653f0bf213..f2d1dc66a69 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -5102,7 +5102,7 @@ dos_yield_time_slice (void)
5102 5102
5103/* Only event queue is checked. */ 5103/* Only event queue is checked. */
5104/* We don't have to call timer_check here 5104/* We don't have to call timer_check here
5105 because wait_reading_process_input takes care of that. */ 5105 because wait_reading_process_output takes care of that. */
5106int 5106int
5107sys_select (nfds, rfds, wfds, efds, timeout) 5107sys_select (nfds, rfds, wfds, efds, timeout)
5108 int nfds; 5108 int nfds;
diff --git a/src/w32proc.c b/src/w32proc.c
index 8452337f7e2..9abee2bf0c2 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1218,7 +1218,7 @@ count_children:
1218 { 1218 {
1219 DebPrint (("select.WaitForMultipleObjects (%d, %lu) failed with %lu\n", 1219 DebPrint (("select.WaitForMultipleObjects (%d, %lu) failed with %lu\n",
1220 nh + nc, timeout_ms, GetLastError ())); 1220 nh + nc, timeout_ms, GetLastError ()));
1221 /* don't return EBADF - this causes wait_reading_process_input to 1221 /* don't return EBADF - this causes wait_reading_process_output to
1222 abort; WAIT_FAILED is returned when single-stepping under 1222 abort; WAIT_FAILED is returned when single-stepping under
1223 Windows 95 after switching thread focus in debugger, and 1223 Windows 95 after switching thread focus in debugger, and
1224 possibly at other times. */ 1224 possibly at other times. */
diff --git a/src/w32term.c b/src/w32term.c
index 71125fe4195..f71736dffad 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4570,7 +4570,7 @@ w32_read_socket (sd, expected, hold_quit)
4570 f->async_visible = 1; 4570 f->async_visible = 1;
4571 f->async_iconified = 0; 4571 f->async_iconified = 0;
4572 4572
4573 /* wait_reading_process_input will notice this and update 4573 /* wait_reading_process_output will notice this and update
4574 the frame's display structures. */ 4574 the frame's display structures. */
4575 SET_FRAME_GARBAGED (f); 4575 SET_FRAME_GARBAGED (f);
4576 4576
diff --git a/src/xdisp.c b/src/xdisp.c
index 7a727938a2c..334ebb72fcb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10381,7 +10381,7 @@ redisplay_internal (preserve_echo_area)
10381 This is useful in situations where you need to redisplay but no 10381 This is useful in situations where you need to redisplay but no
10382 user action has occurred, making it inappropriate for the message 10382 user action has occurred, making it inappropriate for the message
10383 area to be cleared. See tracking_off and 10383 area to be cleared. See tracking_off and
10384 wait_reading_process_input for examples of these situations. 10384 wait_reading_process_output for examples of these situations.
10385 10385
10386 FROM_WHERE is an integer saying from where this function was 10386 FROM_WHERE is an integer saying from where this function was
10387 called. This is useful for debugging. */ 10387 called. This is useful for debugging. */
diff --git a/src/xselect.c b/src/xselect.c
index bf7b21cf323..5de1beb9ac4 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1109,8 +1109,8 @@ wait_for_property_change (location)
1109 secs = x_selection_timeout / 1000; 1109 secs = x_selection_timeout / 1000;
1110 usecs = (x_selection_timeout % 1000) * 1000; 1110 usecs = (x_selection_timeout % 1000) * 1000;
1111 TRACE2 (" Waiting %d secs, %d usecs", secs, usecs); 1111 TRACE2 (" Waiting %d secs, %d usecs", secs, usecs);
1112 wait_reading_process_input (secs, usecs, 0, 0, 1112 wait_reading_process_output (secs, usecs, 0, 0,
1113 property_change_reply, NULL, 0); 1113 property_change_reply, NULL, 0);
1114 1114
1115 if (NILP (XCAR (property_change_reply))) 1115 if (NILP (XCAR (property_change_reply)))
1116 { 1116 {
@@ -1289,8 +1289,8 @@ x_get_foreign_selection (selection_symbol, target_type, time_stamp)
1289 secs = x_selection_timeout / 1000; 1289 secs = x_selection_timeout / 1000;
1290 usecs = (x_selection_timeout % 1000) * 1000; 1290 usecs = (x_selection_timeout % 1000) * 1000;
1291 TRACE1 (" Start waiting %d secs for SelectionNotify", secs); 1291 TRACE1 (" Start waiting %d secs for SelectionNotify", secs);
1292 wait_reading_process_input (secs, usecs, 0, 0, 1292 wait_reading_process_output (secs, usecs, 0, 0,
1293 reading_selection_reply, NULL, 0); 1293 reading_selection_reply, NULL, 0);
1294 TRACE1 (" Got event = %d", !NILP (XCAR (reading_selection_reply))); 1294 TRACE1 (" Got event = %d", !NILP (XCAR (reading_selection_reply)));
1295 1295
1296 BLOCK_INPUT; 1296 BLOCK_INPUT;
diff --git a/src/xterm.c b/src/xterm.c
index 593716032e1..5e6a236c4be 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6174,7 +6174,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
6174 f = x_top_window_to_frame (dpyinfo, event.xmap.window); 6174 f = x_top_window_to_frame (dpyinfo, event.xmap.window);
6175 if (f) 6175 if (f)
6176 { 6176 {
6177 /* wait_reading_process_input will notice this and update 6177 /* wait_reading_process_output will notice this and update
6178 the frame's display structures. 6178 the frame's display structures.
6179 If we where iconified, we should not set garbaged, 6179 If we where iconified, we should not set garbaged,
6180 because that stops redrawing on Expose events. This looks 6180 because that stops redrawing on Expose events. This looks