aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-04-16 00:06:58 +0000
committerRichard M. Stallman1994-04-16 00:06:58 +0000
commit1de8d93d08ada0afae0b6999d5ca7fa43483ea11 (patch)
treec4e554ba42b22f8a37e760ed20f304b9e78fa780
parent0822af61a5dc1082b1434f4e4736a5de0903db70 (diff)
downloademacs-1de8d93d08ada0afae0b6999d5ca7fa43483ea11.tar.gz
emacs-1de8d93d08ada0afae0b6999d5ca7fa43483ea11.zip
(shrink-window-if-larger-than-buffer):
Do nothing for side-by-side windows.
-rw-r--r--lisp/window.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 57fadfd5701..10206e20859 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -143,6 +143,7 @@ ARG columns. No arg means split equally."
143 "Shrink the WINDOW to be as small as possible to display its contents. 143 "Shrink the WINDOW to be as small as possible to display its contents.
144Do nothing if the buffer contains more lines than the present window height, 144Do nothing if the buffer contains more lines than the present window height,
145or if some of the window's contents are scrolled out of view, 145or if some of the window's contents are scrolled out of view,
146or if the window is not the full width of the frame,
146or if the window is the only window of its frame." 147or if the window is the only window of its frame."
147 (interactive) 148 (interactive)
148 (save-excursion 149 (save-excursion
@@ -163,6 +164,7 @@ or if the window is the only window of its frame."
163 (mini (cdr (assq 'minibuffer (frame-parameters)))) 164 (mini (cdr (assq 'minibuffer (frame-parameters))))
164 (edges (window-edges (selected-window)))) 165 (edges (window-edges (selected-window))))
165 (if (and (< 1 (count-windows)) 166 (if (and (< 1 (count-windows))
167 (= (window-width) (screen-width))
166 (pos-visible-in-window-p (point-min) window) 168 (pos-visible-in-window-p (point-min) window)
167 (or (not mini) 169 (or (not mini)
168 (< (nth 3 edges) 170 (< (nth 3 edges)