changeset 85684:4fe615944676

(window_min_size_2): Don't count header-line.
author Martin Rudalics <rudalics@gmx.at>
date Fri, 26 Oct 2007 20:56:47 +0000
parents 2b92bd846058
children 1989e8bb5c7b
files src/window.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.c	Fri Oct 26 20:35:31 2007 +0000
+++ b/src/window.c	Fri Oct 26 20:56:47 2007 +0000
@@ -2690,9 +2690,8 @@
 }
 
 /* Return the minimum size for leaf window W.  WIDTH_P non-zero means
-   take into account fringes and the scrollbar of W.  WIDTH_P zero
-   means take into account mode-line and header-line of W.  Return 1
-   for the minibuffer.  */
+   take into account fringes and the scrollbar of W.  WIDTH_P zero means
+   take into account mode-line of W.  Return 1 for the minibuffer.  */
 
 static int
 window_min_size_2 (w, width_p)
@@ -2711,8 +2710,11 @@
   else
     size = max (window_min_height,
 		(MIN_SAFE_WINDOW_HEIGHT
-		 + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)
-		 + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 )));
+		 /* Don't count the header-line here.  It would break
+		    splitting a window with a header-line when the new
+		    window shall have a height of two (calculator does
+		    that). */
+		 + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)));
 
   return size;
 }