(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 29b9577ec4d983b19e3fd91c45b81adfb198a4ea..c4e664dc849ea8c3ab71c359ccb8010844897aa4 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-31  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * keyboard.c (Freset_this_command_lengths): Doc fix.

diff --git a/src/window.c b/src/window.c
index 38f9d772e4ec45f332214827a3b65148b7c018cb..764ffc04f0471ef33bb30248846c9217bdf449d2 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3777,7 +3777,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)