Commit 7973cfa8 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(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.
parent d7a5ad5f
......@@ -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 ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment