diff options
| author | Miles Bader <miles@gnu.org> | 2000-10-22 04:21:36 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2000-10-22 04:21:36 +0000 |
| commit | 3511cde8e777b31ece6e2cd689c7553e9ae57edb (patch) | |
| tree | 61cb799d67eebc3b96641500b22ad668e45bdc14 | |
| parent | 582b0985f51d7ed2d26852b0cc64a598d3680ef0 (diff) | |
| download | emacs-3511cde8e777b31ece6e2cd689c7553e9ae57edb.tar.gz emacs-3511cde8e777b31ece6e2cd689c7553e9ae57edb.tar.bz2 emacs-3511cde8e777b31ece6e2cd689c7553e9ae57edb.zip | |
(fit-window-to-buffer): Change defaulting of MAX-HEIGHT slightly.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/window.el | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8eea6d16c36..b084904e14b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2000-10-22 Miles Bader <miles@gnu.org> + * window.el (fit-window-to-buffer): Change defaulting of + MAX-HEIGHT slightly. + * faces.el (color-values, color-defined-p): Use `member', not `memq', because it works correctly for strings. (frame-set-background-mode): Actually, "unspecified-fg" and diff --git a/lisp/window.el b/lisp/window.el index 4b0d3b5334f..53d234a3805 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -442,6 +442,8 @@ header-line." (when (null window) (setq window (selected-window))) + (when (null max-height) + (setq max-height (frame-height (window-frame window)))) (let* ((window-height ;; The current height of WINDOW @@ -458,11 +460,7 @@ header-line." (delta ;; Calculate how much the window height has to change to show ;; text-height lines, constrained by MIN-HEIGHT and MAX-HEIGHT. - (- (max (min (+ text-height extra) - (or max-height - (frame-height - (window-frame - (or window (selected-window)))))) + (- (max (min (+ text-height extra) max-height) (or min-height window-min-height)) window-height)) ;; We do our own height checking, so avoid any restrictions due to |