Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

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,
           do
             {
               unsigned old_timers_run = timers_run;
-              struct buffer *old_buffer = current_buffer;
-              Lisp_Object old_window = selected_window;
 
               timer_delay = timer_check ();
 
-              /* If a timer has run, this might have changed buffers
-                 an alike.  Make read_key_sequence aware of that.  */
-              if (timers_run != old_timers_run
-                  && (old_buffer != current_buffer
-                      || !EQ (old_window, selected_window))
-                  && waiting_for_user_input_p == -1)
-                record_asynch_buffer_change ();
-
               if (timers_run != old_timers_run && do_display)
                 /* We must retry, since a timer may have requeued itself
                    and that could alter the time_delay.  */
@@ -5698,9 +5688,6 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
 
       if (read_kbd != 0)
         {
-          unsigned old_timers_run = timers_run;
-          struct buffer *old_buffer = current_buffer;
-          Lisp_Object old_window = selected_window;
           bool leave = false;
 
           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,
                 leave = true;
             }
 
-          /* If a timer has run, this might have changed buffers
-             an alike.  Make read_key_sequence aware of that.  */
-          if (timers_run != old_timers_run
-              && waiting_for_user_input_p == -1
-              && (old_buffer != current_buffer
-              || !EQ (old_window, selected_window)))
-            record_asynch_buffer_change ();
-
           if (leave)
             break;
         }
@@ -6217,18 +6196,6 @@ read_and_dispose_of_process_output (struct Lisp_Process *p, char *chars,
   /* Restore waiting_for_user_input_p as it was
      when we were called, in case the filter clobbered it.  */
   waiting_for_user_input_p = waiting;
-
-#if 0 /* Call record_asynch_buffer_change unconditionally,
-         because we might have changed minor modes or other things
-         that affect key bindings.  */
-  if (! EQ (Fcurrent_buffer (), obuffer)
-      || ! EQ (current_buffer->keymap, okeymap))
-#endif
-    /* But do it only if the caller is actually going to read events.
-       Otherwise there's no need to make him wake up, and it could
-       cause trouble (for example it would make sit_for return).  */
-    if (waiting_for_user_input_p == -1)
-      record_asynch_buffer_change ();
 }
 
 DEFUN ("internal-default-process-filter", Finternal_default_process_filter,
@@ -7394,16 +7361,6 @@ exec_sentinel (Lisp_Object proc, Lisp_Object reason)
      when we were called, in case the filter clobbered it.  */
   waiting_for_user_input_p = waiting;
 
-#if 0
-  if (! EQ (Fcurrent_buffer (), obuffer)
-      || ! EQ (current_buffer->keymap, okeymap))
-#endif
-    /* But do it only if the caller is actually going to read events.
-       Otherwise there's no need to make him wake up, and it could
-       cause trouble (for example it would make sit_for return).  */
-    if (waiting_for_user_input_p == -1)
-      record_asynch_buffer_change ();
-
   unbind_to (count, Qnil);
 }