[Emacs-diffs] Changes to emacs/lisp/window.el,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        07/07/09 12:00:47

Index: window.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/window.el,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- window.el   21 Jan 2007 03:53:10 -0000      1.120
+++ window.el   9 Jul 2007 12:00:47 -0000       1.121
@@ -645,10 +645,7 @@
          ;; 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.