From cf1b1bf8c0b0f5a160ea0caf2f7f1c9e60e14639 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Thu, 22 Sep 1994 20:00:48 +0000
Subject: [PATCH] (shrink-window-if-larger-than-buffer): Use WINDOW's frame for
 all actions that operate on a frame.  Set WINDOW to selected window if it was
 nil.

---
 lisp/window.el | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/lisp/window.el b/lisp/window.el
index 256dbcd43d4..eafded0572b 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -151,31 +151,37 @@ or if some of the window's contents are scrolled out of view,
 or if the window is not the full width of the frame,
 or if the window is the only window of its frame."
   (interactive)
+  (or window (setq window (selected-window)))
   (save-excursion
     (set-buffer (window-buffer window))
-    (let ((w (selected-window)) ;save-window-excursion can't win
-	  (buffer-file-name buffer-file-name)
-	  (p (point))
-	  (n 0)
-	  (ignore-final-newline
-	   ;; If buffer ends with a newline, ignore it when counting height
-	   ;; unless point is after it.
-	   (and (not (eobp))
-		(eq ?\n (char-after (1- (point-max))))))
-	  (buffer-read-only nil)
-	  (modified (buffer-modified-p))
-	  (buffer (current-buffer))
-	  (mini (cdr (assq 'minibuffer (frame-parameters))))
-	  (edges (window-edges (selected-window))))
-      (if (and (< 1 (count-windows))
-	       (= (window-width) (frame-width))
+    (let* ((w (selected-window))	;save-window-excursion can't win
+	   (buffer-file-name buffer-file-name)
+	   (p (point))
+	   (n 0)
+	   (ignore-final-newline
+	    ;; If buffer ends with a newline, ignore it when counting height
+	    ;; unless point is after it.
+	    (and (not (eobp))
+		 (eq ?\n (char-after (1- (point-max))))))
+	   (buffer-read-only nil)
+	   (modified (buffer-modified-p))
+	   (buffer (current-buffer))
+	   (params (frame-parameters (window-frame window)))
+	   (mini (cdr (assq 'minibuffer params)))
+	   (edges (window-edges (selected-window))))
+      (if (and (< 1 (let ((frame (selected-frame)))
+		      (select-frame (window-frame window))
+		      (unwind-protect
+			  (count-windows)
+			(select-frame frame))))
+	       (= (window-width window) (frame-width (window-frame window)))
 	       (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)
-		      (cdr (assq 'menu-bar-lines (frame-parameters))))))
+		      (cdr (assq 'menu-bar-lines params)))))
 	  (unwind-protect
 	      (progn
 		(select-window (or window w))
-- 
2.39.5