bug#8020: 23.2.93; assertion failure on fast frame resize

[Eli Zaretskii]

> Date: Sat, 12 Feb 2011 11:30:28 +0900
> From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
> Cc: 
> 
> This is forked from Bug#7348, and some analysis can be found there.
> (http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7348)
> 
> Steps to reproduce:
> 
>   1. Build emacs with --enable-checking
>   2. emacs -Q
>   3. C-x 2
>   4. Move your mouse to the corner of the frame, grab it, drag up,
>      rescaling the vertically to minimum size
> 
> Result:
> 
>  ../src/xdisp.c:11515: Emacs fatal error: assertion failed: BUFFERP(w->buffer)
> 
> The value of w->buffer was nil when the assertion failure occurred.

Please try the patch below, which is based on the discussions in bug
#7348.  The patch seems to solve the bug on MS-Windows.  If it works
for you on another platform, and doesn't cause problems elsewhere, I
will install it on the emacs-23 branch.

Thanks.


--- src/xdisp.c.orig    2011-01-26 20:15:42.000000000 +0200
+++ src/xdisp.c 2011-02-12 10:48:56.296875000 +0200
@@ -11261,6 +11261,7 @@
      int preserve_echo_area;
 {
   struct window *w = XWINDOW (selected_window);
+  struct window *sw;
   struct frame *f;
   int pause;
   int must_finish = 0;
@@ -11331,6 +11332,9 @@
   }
 
  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.
@@ -11396,6 +11400,14 @@
   /* 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 ();
@@ -11665,6 +11677,10 @@
          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.  */
@@ -11959,8 +11975,9 @@
   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 cache eventually.  */