Mercurial > emacs
changeset 42876:869e78e96e2a
(window-body-height): Handle minibuffer window specially.
Otherwise, don't return less than 1.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 21 Jan 2002 08:55:32 +0000 |
| parents | 87fe94f01b8e |
| children | a5fa9e21eef7 |
| files | lisp/window.el |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/window.el Mon Jan 21 08:53:42 2002 +0000 +++ b/lisp/window.el Mon Jan 21 08:55:32 2002 +0000 @@ -33,10 +33,12 @@ "Return number of lines in window WINDOW for actual buffer text. This does not include the mode line (if any) or the header line (if any)." (or window (setq window (selected-window))) - (with-current-buffer (window-buffer window) - (- (window-height window) - (if mode-line-format 1 0) - (if header-line-format 1 0)))) + (if (window-minibuffer-p window) + (window-height window) + (with-current-buffer (window-buffer window) + (max 1 (- (window-height window) + (if mode-line-format 1 0) + (if header-line-format 1 0)))))) (defun one-window-p (&optional nomini all-frames) "Return non-nil if the selected window is the only window (in its frame).