diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/process.c b/src/process.c index 92bea0d3a27..2cbce9d28ea 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4302,7 +4302,7 @@ wait_reading_process_output_1 (void) | |||
| 4302 | -1 meaning caller will actually read the input, so don't throw to | 4302 | -1 meaning caller will actually read the input, so don't throw to |
| 4303 | the quit handler, or | 4303 | the quit handler, or |
| 4304 | 4304 | ||
| 4305 | DO_DISPLAY != 0 means redisplay should be done to show subprocess | 4305 | DO_DISPLAY means redisplay should be done to show subprocess |
| 4306 | output that arrives. | 4306 | output that arrives. |
| 4307 | 4307 | ||
| 4308 | If WAIT_FOR_CELL is a cons cell, wait until its car is non-nil | 4308 | If WAIT_FOR_CELL is a cons cell, wait until its car is non-nil |
| @@ -4322,7 +4322,7 @@ wait_reading_process_output_1 (void) | |||
| 4322 | 4322 | ||
| 4323 | int | 4323 | int |
| 4324 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | 4324 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, |
| 4325 | int do_display, | 4325 | bool do_display, |
| 4326 | Lisp_Object wait_for_cell, | 4326 | Lisp_Object wait_for_cell, |
| 4327 | struct Lisp_Process *wait_proc, int just_wait_proc) | 4327 | struct Lisp_Process *wait_proc, int just_wait_proc) |
| 4328 | { | 4328 | { |
| @@ -4419,7 +4419,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4419 | 4419 | ||
| 4420 | do | 4420 | do |
| 4421 | { | 4421 | { |
| 4422 | int old_timers_run = timers_run; | 4422 | unsigned old_timers_run = timers_run; |
| 4423 | struct buffer *old_buffer = current_buffer; | 4423 | struct buffer *old_buffer = current_buffer; |
| 4424 | Lisp_Object old_window = selected_window; | 4424 | Lisp_Object old_window = selected_window; |
| 4425 | 4425 | ||
| @@ -4646,6 +4646,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4646 | process_output_skip = 0; | 4646 | process_output_skip = 0; |
| 4647 | } | 4647 | } |
| 4648 | #endif | 4648 | #endif |
| 4649 | |||
| 4649 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) | 4650 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) |
| 4650 | nfds = xg_select | 4651 | nfds = xg_select |
| 4651 | #elif defined (HAVE_NS) | 4652 | #elif defined (HAVE_NS) |
| @@ -4752,7 +4753,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4752 | 4753 | ||
| 4753 | if (read_kbd != 0) | 4754 | if (read_kbd != 0) |
| 4754 | { | 4755 | { |
| 4755 | int old_timers_run = timers_run; | 4756 | unsigned old_timers_run = timers_run; |
| 4756 | struct buffer *old_buffer = current_buffer; | 4757 | struct buffer *old_buffer = current_buffer; |
| 4757 | Lisp_Object old_window = selected_window; | 4758 | Lisp_Object old_window = selected_window; |
| 4758 | int leave = 0; | 4759 | int leave = 0; |
| @@ -6820,14 +6821,14 @@ extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, | |||
| 6820 | see full version for other parameters. We know that wait_proc will | 6821 | see full version for other parameters. We know that wait_proc will |
| 6821 | always be NULL, since `subprocesses' isn't defined. | 6822 | always be NULL, since `subprocesses' isn't defined. |
| 6822 | 6823 | ||
| 6823 | DO_DISPLAY != 0 means redisplay should be done to show subprocess | 6824 | DO_DISPLAY means redisplay should be done to show subprocess |
| 6824 | output that arrives. | 6825 | output that arrives. |
| 6825 | 6826 | ||
| 6826 | Return true if we received input from any process. */ | 6827 | Return true if we received input from any process. */ |
| 6827 | 6828 | ||
| 6828 | int | 6829 | int |
| 6829 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | 6830 | wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, |
| 6830 | int do_display, | 6831 | bool do_display, |
| 6831 | Lisp_Object wait_for_cell, | 6832 | Lisp_Object wait_for_cell, |
| 6832 | struct Lisp_Process *wait_proc, int just_wait_proc) | 6833 | struct Lisp_Process *wait_proc, int just_wait_proc) |
| 6833 | { | 6834 | { |
| @@ -6903,7 +6904,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 6903 | 6904 | ||
| 6904 | do | 6905 | do |
| 6905 | { | 6906 | { |
| 6906 | int old_timers_run = timers_run; | 6907 | unsigned old_timers_run = timers_run; |
| 6907 | timer_delay = timer_check (); | 6908 | timer_delay = timer_check (); |
| 6908 | if (timers_run != old_timers_run && do_display) | 6909 | if (timers_run != old_timers_run && do_display) |
| 6909 | /* We must retry, since a timer may have requeued itself | 6910 | /* We must retry, since a timer may have requeued itself |