[Emacs-diffs] trunk r115380: * src/window.c (select_window): Call second wset_redisplay before we change

[Stefan Monnier]

------------------------------------------------------------
revno: 115380
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16034
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 16:08:21 -0500
message:
  * src/window.c (select_window): Call second wset_redisplay before we change
  selected_window.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-04 19:19:45 +0000
+++ b/src/ChangeLog     2013-12-04 21:08:21 +0000
@@ -1,3 +1,8 @@
+2013-12-04  Stefan Monnier  <address@hidden>
+
+       * window.c (select_window): Call second wset_redisplay before we change
+       selected_window (bug#16034).
+
 2013-12-04  Paul Eggert  <address@hidden>
 
        * bidi.c (LRM_CHAR, RLM_CHAR): Remove; no longer used.

=== modified file 'src/window.c'
--- a/src/window.c      2013-12-04 18:46:47 +0000
+++ b/src/window.c      2013-12-04 21:08:21 +0000
@@ -487,11 +487,14 @@
     goto record_and_return;
 
   if (NILP (norecord))
-    /* Mark the window for redisplay since the selected-window has a different
-       mode-line.  */
-    wset_redisplay (XWINDOW (selected_window));
+    { /* Mark the window for redisplay since the selected-window has
+        a different mode-line.  */
+      wset_redisplay (XWINDOW (selected_window));
+      wset_redisplay (w);
+    }
   else
     redisplay_other_windows ();
+
   sf = SELECTED_FRAME ();
   if (XFRAME (WINDOW_FRAME (w)) != sf)
     {
@@ -510,8 +513,6 @@
 
   select_window_1 (window, inhibit_point_swap);
   bset_last_selected_window (XBUFFER (w->contents), window);
-  if (NILP (norecord))
-    wset_redisplay (w);
 
  record_and_return:
   /* record_buffer can run QUIT, so make sure it is run only after we have