aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1997-07-21 20:00:36 +0000
committerRichard M. Stallman1997-07-21 20:00:36 +0000
commitc6b530ed93cce351fb5c87cfecaa9298ba7a9698 (patch)
treee2f064c02e00e8d5cc768a3c4f44083f09d79bd2 /src
parent049f742524311e125c08cfb3eeb0335d6c8e7214 (diff)
downloademacs-c6b530ed93cce351fb5c87cfecaa9298ba7a9698.tar.gz
emacs-c6b530ed93cce351fb5c87cfecaa9298ba7a9698.zip
(set_window_height): Allow all heights > 0 for minibuffer windows.
(change_window_height): Fix one-off comparing DELTA with MAXIMUM.
Diffstat (limited to 'src')
-rw-r--r--src/window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index 87807ac1de3..95559b6fbc7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1735,7 +1735,9 @@ set_window_height (window, height, nodelete)
1735 1735
1736 if (!nodelete 1736 if (!nodelete
1737 && ! NILP (w->parent) 1737 && ! NILP (w->parent)
1738 && height < window_min_height) 1738 && (MINI_WINDOW_P (w)
1739 ? height < 1
1740 : height < window_min_height))
1739 { 1741 {
1740 delete_window (window); 1742 delete_window (window);
1741 return; 1743 return;
@@ -2608,7 +2610,7 @@ change_window_height (delta, widthflag)
2608 maximum += (*sizefun) (prev) - MINSIZE (prev); 2610 maximum += (*sizefun) (prev) - MINSIZE (prev);
2609 2611
2610 /* If we can get it all from them, do so. */ 2612 /* If we can get it all from them, do so. */
2611 if (delta < maximum) 2613 if (delta <= maximum)
2612 { 2614 {
2613 Lisp_Object first_unaffected; 2615 Lisp_Object first_unaffected;
2614 Lisp_Object first_affected; 2616 Lisp_Object first_affected;