procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In Fformat_mode_line always save/restore current buffer. (Bug#12387)

Browse source 
* xdisp.c (Fformat_mode_line): Unconditionally save/restore current
buffer.  (Bug#12387)
This commit is contained in:
Martin Rudalics 2012-09-14 08:55:38 +02:00
parent 2de39f089a
commit 6b533e9cb5
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-14 Martin Rudalics <rudalics@gmx.at>
* xdisp.c (Fformat_mode_line): Unconditionally save/restore
current buffer (Bug#12387).
2012-09-14 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies.

6
src/xdisp.c
View file

@ -21039,8 +21039,7 @@ are the selected window and the WINDOW's buffer). */)
: EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
: DEFAULT_FACE_ID;
if (XBUFFER (buffer) != current_buffer)
old_buffer = current_buffer;
old_buffer = current_buffer;
/* Save things including mode_line_proptrans_alist,
and set that to nil so that we don't alter the outer value. */
@ -21051,8 +21050,7 @@ are the selected window and the WINDOW's buffer). */)
mode_line_proptrans_alist = Qnil;
Fselect_window (window, Qt);
if (old_buffer)
set_buffer_internal_1 (XBUFFER (buffer));
set_buffer_internal_1 (XBUFFER (buffer));
init_iterator (&it, w, -1, -1, NULL, face_id);