auto upstream

2 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e7c05e3d36..a35c51b8555 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
 2012-12-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * xdisp.c (select_frame_for_redisplay): Keep selected_window and
-        selected_frame in sync.
+        * xdisp.c (select_frame_for_redisplay, display_mode_lines):
+        Keep selected_window and selected_frame in sync.
 
 2012-12-14  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xdisp.c b/src/xdisp.c
index ca9992bf804..9941f7be35d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20459,12 +20459,13 @@ redisplay_mode_lines (Lisp_Object window, int force)
 static int
 display_mode_lines (struct window *w)
 {
-  Lisp_Object old_selected_window, old_selected_frame;
+  Lisp_Object old_selected_window = selected_window;
+  Lisp_Object old_selected_frame = selected_frame;
+  Lisp_Object new_frame = w->frame;
+  Lisp_Object old_frame_selected_window = XFRAME (new_frame)->selected_window;
   int n = 0;
 
-  old_selected_frame = selected_frame;
   selected_frame = w->frame;
-  old_selected_window = selected_window;
   XSETWINDOW (selected_window, w);
 
   /* These will be set while the mode line specs are processed.  */
@@ -20488,6 +20489,7 @@ display_mode_lines (struct window *w)
       ++n;
     }
 
+  XFRAME (new_frame)->selected_window = old_frame_selected_window;
   selected_frame = old_selected_frame;
   selected_window = old_selected_window;
   return n;