]> git.eshelyaron.com Git - emacs.git/commitdiff
Strengthen conditions for resizing sibling windows (Bug#25169)
authorMartin Rudalics <rudalics@gmx.at>
Mon, 12 Dec 2016 09:16:23 +0000 (10:16 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Mon, 12 Dec 2016 09:16:23 +0000 (10:16 +0100)
* lisp/window.el (window-resize, delete-window): Resize other siblings
only if `window-combination-resize' equals t (Bug#25169).

lisp/window.el

index 5255905f4574fdf8b009e82401037a3bbdefa129..fdb67ed4a8738c616fda75a39c5558e38dfcdab7 100644 (file)
@@ -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)