aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2016-12-12 10:16:23 +0100
committerMartin Rudalics2016-12-12 10:16:23 +0100
commit184ed36136d7d78a914979009db208518312137c (patch)
tree4bf203994b2abbbc30856e537f4eed8c04c509c1
parenta92a027d58cb4df5bb6c7e3c546a72183a192f45 (diff)
downloademacs-184ed36136d7d78a914979009db208518312137c.tar.gz
emacs-184ed36136d7d78a914979009db208518312137c.zip
Strengthen conditions for resizing sibling windows (Bug#25169)
* lisp/window.el (window-resize, delete-window): Resize other siblings only if `window-combination-resize' equals t (Bug#25169).
-rw-r--r--lisp/window.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 5255905f457..fdb67ed4a87 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2797,7 +2797,7 @@ instead."
2797 window delta horizontal ignore nil nil nil t))) 2797 window delta horizontal ignore nil nil nil t)))
2798 (window--resize-reset frame horizontal) 2798 (window--resize-reset frame horizontal)
2799 (window--resize-this-window window delta horizontal ignore t) 2799 (window--resize-this-window window delta horizontal ignore t)
2800 (if (and (not window-combination-resize) 2800 (if (and (not (eq window-combination-resize t))
2801 (window-combined-p window horizontal) 2801 (window-combined-p window horizontal)
2802 (setq sibling (or (window-right window) (window-left window))) 2802 (setq sibling (or (window-right window) (window-left window)))
2803 (window-sizable-p 2803 (window-sizable-p
@@ -4049,7 +4049,7 @@ that is its frame's root window."
4049 (sibling (or (window-left window) (window-right window)))) 4049 (sibling (or (window-left window) (window-right window))))
4050 (window--resize-reset frame horizontal) 4050 (window--resize-reset frame horizontal)
4051 (cond 4051 (cond
4052 ((and (not window-combination-resize) 4052 ((and (not (eq window-combination-resize t))
4053 sibling (window-sizable-p sibling size horizontal nil t)) 4053 sibling (window-sizable-p sibling size horizontal nil t))
4054 ;; Resize WINDOW's sibling. 4054 ;; Resize WINDOW's sibling.
4055 (window--resize-this-window sibling size horizontal nil t) 4055 (window--resize-this-window sibling size horizontal nil t)