(resize_mini_window): Don't resize while redisplaying.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cd8a760737bb3d0a140ba3ffff44eea99d3c0f3..76101cce23fdcb6e109a943f364e1fee172c2e04 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-25  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (resize_mini_window): Don't resize while redisplaying.
+
 2001-07-24  Gerd Moellmann  <gerd@gnu.org>
 
        * xfns.c (valid_image_p): Protect better against invalid image

diff --git a/src/xdisp.c b/src/xdisp.c
index ba9e08dba49b00aa0e37845baf7e90ea2d9c74ee..6a56fe1874040362b669d18f329fbda055d2be97 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6500,6 +6500,12 @@ resize_mini_window (w, exact_p)
 
   xassert (MINI_WINDOW_P (w));
 
+  /* Don't resize windows while redisplaying; it would confuse
+     redisplay functions when the size of the window they are
+     displaying changes from under them.  */
+  if (redisplaying_p)
+    return 0;
+  
   /* Nil means don't try to resize.  */
   if (NILP (Vresize_mini_windows)
       || (FRAME_X_P (f) && f->output_data.x == NULL))