From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 31 Oct 2001 10:06:35 +0000 (+0000)
Subject: (grow_mini_window): Handle case that the root
X-Git-Tag: ttn-vms-21-2-B4~18967
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eafa319686563cbfb93ba725bb1d5d7a5e8c1a3b;p=emacs.git

(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 cf8cc35a5fa..cb08a806bb5 100644
--- 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 0c095c1a826..5f122976d9b 100644
--- 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)