diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/process.c b/src/process.c index 9926993fae9..b2d94d8f8a8 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5328,19 +5328,9 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5328 | do | 5328 | do |
| 5329 | { | 5329 | { |
| 5330 | unsigned old_timers_run = timers_run; | 5330 | unsigned old_timers_run = timers_run; |
| 5331 | struct buffer *old_buffer = current_buffer; | ||
| 5332 | Lisp_Object old_window = selected_window; | ||
| 5333 | 5331 | ||
| 5334 | timer_delay = timer_check (); | 5332 | timer_delay = timer_check (); |
| 5335 | 5333 | ||
| 5336 | /* If a timer has run, this might have changed buffers | ||
| 5337 | an alike. Make read_key_sequence aware of that. */ | ||
| 5338 | if (timers_run != old_timers_run | ||
| 5339 | && (old_buffer != current_buffer | ||
| 5340 | || !EQ (old_window, selected_window)) | ||
| 5341 | && waiting_for_user_input_p == -1) | ||
| 5342 | record_asynch_buffer_change (); | ||
| 5343 | |||
| 5344 | if (timers_run != old_timers_run && do_display) | 5334 | if (timers_run != old_timers_run && do_display) |
| 5345 | /* We must retry, since a timer may have requeued itself | 5335 | /* We must retry, since a timer may have requeued itself |
| 5346 | and that could alter the time_delay. */ | 5336 | and that could alter the time_delay. */ |
| @@ -5698,9 +5688,6 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5698 | 5688 | ||
| 5699 | if (read_kbd != 0) | 5689 | if (read_kbd != 0) |
| 5700 | { | 5690 | { |
| 5701 | unsigned old_timers_run = timers_run; | ||
| 5702 | struct buffer *old_buffer = current_buffer; | ||
| 5703 | Lisp_Object old_window = selected_window; | ||
| 5704 | bool leave = false; | 5691 | bool leave = false; |
| 5705 | 5692 | ||
| 5706 | if (detect_input_pending_run_timers (do_display)) | 5693 | if (detect_input_pending_run_timers (do_display)) |
| @@ -5710,14 +5697,6 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 5710 | leave = true; | 5697 | leave = true; |
| 5711 | } | 5698 | } |
| 5712 | 5699 | ||
| 5713 | /* If a timer has run, this might have changed buffers | ||
| 5714 | an alike. Make read_key_sequence aware of that. */ | ||
| 5715 | if (timers_run != old_timers_run | ||
| 5716 | && waiting_for_user_input_p == -1 | ||
| 5717 | && (old_buffer != current_buffer | ||
| 5718 | || !EQ (old_window, selected_window))) | ||
| 5719 | record_asynch_buffer_change (); | ||
| 5720 | |||
| 5721 | if (leave) | 5700 | if (leave) |
| 5722 | break; | 5701 | break; |
| 5723 | } | 5702 | } |
| @@ -6217,18 +6196,6 @@ read_and_dispose_of_process_output (struct Lisp_Process *p, char *chars, | |||
| 6217 | /* Restore waiting_for_user_input_p as it was | 6196 | /* Restore waiting_for_user_input_p as it was |
| 6218 | when we were called, in case the filter clobbered it. */ | 6197 | when we were called, in case the filter clobbered it. */ |
| 6219 | waiting_for_user_input_p = waiting; | 6198 | waiting_for_user_input_p = waiting; |
| 6220 | |||
| 6221 | #if 0 /* Call record_asynch_buffer_change unconditionally, | ||
| 6222 | because we might have changed minor modes or other things | ||
| 6223 | that affect key bindings. */ | ||
| 6224 | if (! EQ (Fcurrent_buffer (), obuffer) | ||
| 6225 | || ! EQ (current_buffer->keymap, okeymap)) | ||
| 6226 | #endif | ||
| 6227 | /* But do it only if the caller is actually going to read events. | ||
| 6228 | Otherwise there's no need to make him wake up, and it could | ||
| 6229 | cause trouble (for example it would make sit_for return). */ | ||
| 6230 | if (waiting_for_user_input_p == -1) | ||
| 6231 | record_asynch_buffer_change (); | ||
| 6232 | } | 6199 | } |
| 6233 | 6200 | ||
| 6234 | DEFUN ("internal-default-process-filter", Finternal_default_process_filter, | 6201 | DEFUN ("internal-default-process-filter", Finternal_default_process_filter, |
| @@ -7394,16 +7361,6 @@ exec_sentinel (Lisp_Object proc, Lisp_Object reason) | |||
| 7394 | when we were called, in case the filter clobbered it. */ | 7361 | when we were called, in case the filter clobbered it. */ |
| 7395 | waiting_for_user_input_p = waiting; | 7362 | waiting_for_user_input_p = waiting; |
| 7396 | 7363 | ||
| 7397 | #if 0 | ||
| 7398 | if (! EQ (Fcurrent_buffer (), obuffer) | ||
| 7399 | || ! EQ (current_buffer->keymap, okeymap)) | ||
| 7400 | #endif | ||
| 7401 | /* But do it only if the caller is actually going to read events. | ||
| 7402 | Otherwise there's no need to make him wake up, and it could | ||
| 7403 | cause trouble (for example it would make sit_for return). */ | ||
| 7404 | if (waiting_for_user_input_p == -1) | ||
| 7405 | record_asynch_buffer_change (); | ||
| 7406 | |||
| 7407 | unbind_to (count, Qnil); | 7364 | unbind_to (count, Qnil); |
| 7408 | } | 7365 | } |
| 7409 | 7366 | ||