aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-25 12:04:25 +0000
committerGerd Moellmann2001-07-25 12:04:25 +0000
commit64c5be50fbdfe84d9da49f9cef73cea606d99ab8 (patch)
treec333f630bc0e29e812babf07fc7072601d1b9007
parente043664a1d57724b3ce11f1ccc61574ec990b73a (diff)
downloademacs-64c5be50fbdfe84d9da49f9cef73cea606d99ab8.tar.gz
emacs-64c5be50fbdfe84d9da49f9cef73cea606d99ab8.zip
(resize_mini_window): Don't resize while redisplaying.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5cd8a760737..76101cce23f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-07-25 Gerd Moellmann <gerd@gnu.org>
2
3 * xdisp.c (resize_mini_window): Don't resize while redisplaying.
4
12001-07-24 Gerd Moellmann <gerd@gnu.org> 52001-07-24 Gerd Moellmann <gerd@gnu.org>
2 6
3 * xfns.c (valid_image_p): Protect better against invalid image 7 * xfns.c (valid_image_p): Protect better against invalid image
diff --git a/src/xdisp.c b/src/xdisp.c
index ba9e08dba49..6a56fe18740 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6500,6 +6500,12 @@ resize_mini_window (w, exact_p)
6500 6500
6501 xassert (MINI_WINDOW_P (w)); 6501 xassert (MINI_WINDOW_P (w));
6502 6502
6503 /* Don't resize windows while redisplaying; it would confuse
6504 redisplay functions when the size of the window they are
6505 displaying changes from under them. */
6506 if (redisplaying_p)
6507 return 0;
6508
6503 /* Nil means don't try to resize. */ 6509 /* Nil means don't try to resize. */
6504 if (NILP (Vresize_mini_windows) 6510 if (NILP (Vresize_mini_windows)
6505 || (FRAME_X_P (f) && f->output_data.x == NULL)) 6511 || (FRAME_X_P (f) && f->output_data.x == NULL))