summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/window.el8
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