(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 25ed4c24e311a7bdbe92c94fafc48f45fcb241c0..3f9d5b3bce196039777cec55cc67c4ef0c56394a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-09  Jan Dj\e,Ad\e(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 921d84d6e7de2bb870abad29e751c11d10398df8..216e89249c69c410082cce2c6a0f95bbbbcba879 100644 (file)
--- 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.