(read_process_output, exec_sentinel): Call

record_asynch_buffer_change after any eval.  Don't call
prepare_menu_bars.
(wait_reading_process_input): Don't call prepare_menu_bars.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/process.c b/src/process.c
index 714fc928c09..438f6e21e4c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2387,13 +2387,14 @@ read_process_output (proc, channel)
       /* Handling the process output should not deactivate the mark.  */
       Vdeactivate_mark = odeactivate;
 
+#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
         record_asynch_buffer_change ();
 
-      if (waiting_for_user_input_p)
-        prepare_menu_bars ();
-
 #ifdef VMS
       start_vms_process_read (vs);
 #endif
@@ -3386,12 +3387,12 @@ exec_sentinel (proc, reason)
   restore_match_data ();
 
   Vdeactivate_mark = odeactivate;
+#if 0
   if (! EQ (Fcurrent_buffer (), obuffer)
       || ! EQ (current_buffer->keymap, okeymap))
+#endif
     record_asynch_buffer_change ();
 
-  if (waiting_for_user_input_p)
-    prepare_menu_bars ();
   unbind_to (count, Qnil);
 }
 
@@ -3732,9 +3733,6 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
     /* It's infinite.  */
     timeout_p = 0;
 
-  /* This must come before stop_polling.  */
-  prepare_menu_bars ();
-
   /* Turn off periodic alarms (in case they are in use)
      because the select emulator uses alarms.  */
   stop_polling ();