(grow_mini_window): Handle case that the root

window is already smaller than the nominal mininum height.

diff --git a/src/ChangeLog b/src/ChangeLog
index cf8cc35a5fa91d7adb85af0ac274f86a7e1a9d7f..cb08a806bb5b25e9831d92d8a5a00250f77c3784 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-31  Gerd Moellmann  <gerd@gnu.org>
+
+       * window.c (grow_mini_window): Handle case that the root
+       window is already smaller than the nominal mininum height.
+
 2001-10-30  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs.c (main): Don't call keys_of_macros any more.

diff --git a/src/window.c b/src/window.c
index 0c095c1a826fe828f4e3de0b26c8dc6182eba3a2..5f122976d9bf82296265e8c336b0227933f6d5f8 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3751,7 +3751,9 @@ grow_mini_window (w, delta)
     {
       int min_height = window_min_size (root, 0, 0, 0);
       if (XFASTINT (root->height) - delta < min_height)
-       delta = XFASTINT (root->height) - min_height;
+       /* Note that the roor window may already be smaller than
+          min_height.  */
+       delta = max (0, XFASTINT (root->height) - min_height);
     }
     
   if (delta)