From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 26 Oct 2007 20:50:17 +0000 (+0000)
Subject: (window_min_size_2): Don't count header-line.
X-Git-Tag: emacs-pretest-22.1.90~498
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6ff295c434269fe824ec47cbfc87c6a02dfd94d;p=emacs.git

(window_min_size_2): Don't count header-line.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 86f77fabd02..05995663862 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-26  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (window_min_size_2): Don't count header-line.
+
 2007-10-25  Juanma Barranquero  <lekktu@gmail.com>
 
 	* w32.c (init_environment): Fix tiny memory leak.
diff --git a/src/window.c b/src/window.c
index 6fe78166ba1..4e8ad699500 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2665,9 +2665,8 @@ window_fixed_size_p (w, width_p, check_siblings_p)
 }
 
 /* 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)
@@ -2686,8 +2685,11 @@ window_min_size_2 (w, width_p)
   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;
 }