Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.

2 files changed, 25 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aae583094f2..d70da316ba9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected
+        window is changed inside calls to do_pending_window_change.
+        (Bug#8020)
+
 2011-02-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove no-longer needed getloadavg symbols.
diff --git a/src/xdisp.c b/src/xdisp.c
index 68f7835f0d7..147f2965d0e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11419,6 +11419,7 @@ static void
 redisplay_internal (int preserve_echo_area)
 {
   struct window *w = XWINDOW (selected_window);
+  struct window *sw;
   struct frame *f;
   int pause;
   int must_finish = 0;
@@ -11479,6 +11480,9 @@ redisplay_internal (int preserve_echo_area)
   }
 
  retry:
+  /* Remember the currently selected window.  */
+  sw = w;
+
   if (!EQ (old_frame, selected_frame)
       && FRAME_LIVE_P (XFRAME (old_frame)))
     /* When running redisplay, we play a bit fast-and-loose and allow e.g.
@@ -11546,6 +11550,14 @@ redisplay_internal (int preserve_echo_area)
   /* Notice any pending interrupt request to change frame size.  */
   do_pending_window_change (1);
 
+  /* do_pending_window_change could change the selected_window due to
+     frame resizing which makes the selected window too small.  */
+  if (WINDOWP (selected_window) && (w = XWINDOW (selected_window)) != sw)
+    {
+      sw = w;
+      reconsider_clip_changes (w, current_buffer);
+    }
+
   /* Clear frames marked as garbaged.  */
   if (frame_garbaged)
     clear_garbaged_frames ();
@@ -11815,6 +11827,10 @@ redisplay_internal (int preserve_echo_area)
           if (!must_finish)
             {
               do_pending_window_change (1);
+              /* If selected_window changed, redisplay again.  */
+              if (WINDOWP (selected_window)
+                  && (w = XWINDOW (selected_window)) != sw)
+                goto retry;
 
               /* We used to always goto end_of_redisplay here, but this
                  isn't enough if we have a blinking cursor.  */
@@ -12109,8 +12125,9 @@ redisplay_internal (int preserve_echo_area)
   do_pending_window_change (1);
 
   /* If we just did a pending size change, or have additional
-     visible frames, redisplay again.  */
-  if (windows_or_buffers_changed && !pause)
+     visible frames, or selected_window changed, redisplay again.  */
+  if ((windows_or_buffers_changed && !pause)
+      || (WINDOWP (selected_window) && (w = XWINDOW (selected_window)) != sw))
     goto retry;
 
   /* Clear the face and image caches.