From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 12 Dec 2016 09:16:23 +0000 (+0100)
Subject: Strengthen conditions for resizing sibling windows (Bug#25169)
X-Git-Tag: emacs-26.0.90~1128
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=184ed36136d7d78a914979009db208518312137c;p=emacs.git

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).
---

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."
 		window delta horizontal ignore nil nil nil t)))
       (window--resize-reset frame horizontal)
       (window--resize-this-window window delta horizontal ignore t)
-      (if (and (not window-combination-resize)
+      (if (and (not (eq window-combination-resize t))
 	       (window-combined-p window horizontal)
 	       (setq sibling (or (window-right window) (window-left window)))
 	       (window-sizable-p
@@ -4049,7 +4049,7 @@ that is its frame's root window."
 	     (sibling (or (window-left window) (window-right window))))
 	(window--resize-reset frame horizontal)
 	(cond
-	 ((and (not window-combination-resize)
+	 ((and (not (eq window-combination-resize t))
 	       sibling (window-sizable-p sibling size horizontal nil t))
 	  ;; Resize WINDOW's sibling.
 	  (window--resize-this-window sibling size horizontal nil t)