# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 984063824 0
# Node ID 2b284278da9cc7f3bf46c1e636757d0ef529307a
# Parent  e2b1703a8fe8a5b476aef72f483b8acc17ab471e
(shrink-window-if-larger-than-buffer): Handle frame
parameter `(minibuffer . t)'.

diff -r e2b1703a8fe8 -r 2b284278da9c lisp/window.el
--- 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 ()