diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2021-01-10 11:20:56 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2021-01-10 11:20:56 +0100 |
| commit | 55bc1560ac804a2faa497707ae9b1364cc5c8592 (patch) | |
| tree | 83fb56929c87d4c38da7bbf9b8696f64593066cd | |
| parent | 27743e9e709aa9b6cf5e84d2dfa97a68fc359cab (diff) | |
| download | emacs-55bc1560ac804a2faa497707ae9b1364cc5c8592.tar.gz | |
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).
| -rw-r--r-- | lisp/window.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/window.el b/lisp/window.el index 11b56d0820c..f388f863725 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 |