Mercurial > emacs
changeset 36666:2b284278da9c
(shrink-window-if-larger-than-buffer): Handle frame
parameter `(minibuffer . t)'.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 08 Mar 2001 15:03:44 +0000 |
| parents | e2b1703a8fe8 |
| children | f3b29117d2dd |
| files | lisp/window.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/window.el Thu Mar 08 14:16:36 2001 +0000 +++ b/lisp/window.el Thu Mar 08 15:03:44 2001 +0000 @@ -1,6 +1,6 @@ ;;; window.el --- GNU Emacs window commands aside from those written in C. -;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000 +;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -472,8 +472,13 @@ (pos-visible-in-window-p (point-min) window) (not (eq mini 'only)) (or (not mini) - (< (nth 3 edges) (nth 1 (window-edges mini))) - (> (nth 1 edges) (frame-parameter frame 'menu-bar-lines)))) + (let ((mini-window (minibuffer-window frame))) + (or (null mini-window) + (not (eq frame (window-frame mini-window))) + (< (nth 3 edges) + (nth 1 (window-edges mini-window))) + (> (nth 1 edges) + (frame-parameter frame 'menu-bar-lines)))))) (fit-window-to-buffer window (window-height window))))) (defun kill-buffer-and-window ()