mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 08:31:35 -08:00
Code Issues Projects Releases Wiki Activity

(message_dolog): Save and restore Vdeactivate_mark.

Browse source 
(prepare_menu_bars): Fstore_match_data => Fset_match_data.
(update_menu_bar): Likewise.
This commit is contained in:
Richard M. Stallman 1998-03-14 08:27:01 +00:00
parent 58226364be
commit 84dd0ae555
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/xdisp.c
View file

@ -290,7 +290,9 @@ message_dolog (m, len, nlflag, multibyte)
int old_windows_or_buffers_changed = windows_or_buffers_changed;
int point_at_end = 0;
int zv_at_end = 0;
Lisp_Object old_deactivate_mark;
old_deactivate_mark = Vdeactivate_mark;
oldbuf = current_buffer;
Fset_buffer (Fget_buffer_create (build_string ("*Messages*")));
current_buffer->undo_list = Qt;
@ -414,6 +416,7 @@ message_dolog (m, len, nlflag, multibyte)
set_buffer_internal (oldbuf);
windows_or_buffers_changed = old_windows_or_buffers_changed;
message_log_need_newline = !nlflag;
Vdeactivate_mark = old_deactivate_mark;
}
}
@ -926,7 +929,7 @@ prepare_menu_bars ()
Lisp_Object tail, frame;
int count = specpdl_ptr - specpdl;
record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil));
record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
FOR_EACH_FRAME (tail, frame)
{
@ -1629,7 +1632,7 @@ update_menu_bar (f, save_match_data)
set_buffer_internal_1 (XBUFFER (w->buffer));
if (save_match_data)
record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil));
record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
if (NILP (Voverriding_local_map_menu_flag))
{
specbind (Qoverriding_terminal_local_map, Qnil);