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

[Richard M. Stallman]

Index: emacs/lisp/window.el
diff -c emacs/lisp/window.el:1.81 emacs/lisp/window.el:1.82
*** emacs/lisp/window.el:1.81   Fri Jan 18 00:42:23 2002
--- emacs/lisp/window.el        Mon Jan 21 03:55:32 2002
***************
*** 33,42 ****
    "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))))
  
  (defun one-window-p (&optional nomini all-frames)
    "Return non-nil if the selected window is the only window (in its frame).
--- 33,44 ----
    "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)))
!   (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).