[Emacs-diffs] /srv/bzr/emacs/trunk r110025: In Fformat_mode_line always save/restore current buffer. (Bug#12387)

[martin rudalics]

------------------------------------------------------------
revno: 110025
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-14 08:55:38 +0200
message:
  In Fformat_mode_line always save/restore current buffer.  (Bug#12387)
  
  * xdisp.c (Fformat_mode_line): Unconditionally save/restore current
  buffer.  (Bug#12387)
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-14 01:22:21 +0000
+++ b/src/ChangeLog     2012-09-14 06:55:38 +0000
@@ -1,3 +1,8 @@
+2012-09-14  Martin Rudalics  <address@hidden>
+
+       * xdisp.c (Fformat_mode_line): Unconditionally save/restore
+       current buffer (Bug#12387).
+
 2012-09-14  Juanma Barranquero  <address@hidden>
 
        * makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-09-12 00:14:50 +0000
+++ b/src/xdisp.c       2012-09-14 06:55:38 +0000
@@ -21039,8 +21039,7 @@
     : 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 @@
   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);