emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-27 55bc156: Fix assertion failure in window_box_height (Bug#45737)


From: Martin Rudalics
Subject: emacs-27 55bc156: Fix assertion failure in window_box_height (Bug#45737)
Date: Sun, 10 Jan 2021 05:21:54 -0500 (EST)

branch: emacs-27
commit 55bc1560ac804a2faa497707ae9b1364cc5c8592
Author: Martin Rudalics <rudalics@gmx.at>
Commit: Martin Rudalics <rudalics@gmx.at>

    Fix assertion failure in window_box_height (Bug#45737)
    
    * lisp/window.el (window-sizable): Don't try to grow a mini window
    when the root window's minimum height is already larger than its
    actual height (Bug#45737).
---
 lisp/window.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/window.el b/lisp/window.el
index 11b56d0..f388f86 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1716,9 +1716,11 @@ interpret DELTA as pixels."
   (setq window (window-normalize-window window))
   (cond
    ((< delta 0)
-    (max (- (window-min-size window horizontal ignore pixelwise)
-           (window-size window horizontal pixelwise))
-        delta))
+    (let ((min-size (window-min-size window horizontal ignore pixelwise))
+          (size (window-size window horizontal pixelwise)))
+      (if (<= size min-size)
+          0
+        (max (- min-size size) delta))))
    ((> delta 0)
     (if (window-size-fixed-p window horizontal ignore)
        0



reply via email to

[Prev in Thread] Current Thread [Next in Thread]