From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 9 Jul 2007 12:00:56 +0000 (+0000)
Subject: (fit-window-to-buffer): Remove setting of window-min-height
X-Git-Tag: emacs-pretest-23.0.90~11991
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=825906b8afc9f011ac6f7a16fcfbbafdf0226523;p=emacs.git

(fit-window-to-buffer): Remove setting of window-min-height
to 1 as enlarge-window uses the value to resize/shrink windows other than
WINDOW if needed.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25ed4c24e31..3f9d5b3bce1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-09  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* window.el (fit-window-to-buffer): Remove setting of window-min-height
+	to 1 as enlarge-window uses the value to resize/shrink windows other than
+	WINDOW if needed.
+
 2007-07-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* cus-start.el (file-coding-system-alist): Fix custom type.
diff --git a/lisp/window.el b/lisp/window.el
index 921d84d6e7d..216e89249c6 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -645,10 +645,7 @@ header-line."
 	  ;; desired-height lines, constrained by MIN-HEIGHT and MAX-HEIGHT.
 	  (- (max (min desired-height max-height)
 		  (or min-height window-min-height))
-	     window-height))
-	 ;; We do our own height checking, so avoid any restrictions due to
-	 ;; window-min-height.
-	 (window-min-height 1))
+	     window-height)))
 
     ;; Don't try to redisplay with the cursor at the end
     ;; on its own line--that would force a scroll and spoil things.