Mercurial > emacs
comparison src/window.c @ 18900:23ee59ec294b
(set_window_height): Allow all heights > 0 for minibuffer windows.
(change_window_height): Fix one-off comparing DELTA with MAXIMUM.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 21 Jul 1997 20:00:36 +0000 |
parents | 7f8578d75d45 |
children | 0651874195c7 |
comparison
equal
deleted
inserted
replaced
18899:3cd2c58b1d6f | 18900:23ee59ec294b |
---|---|
1733 | 1733 |
1734 check_min_window_sizes (); | 1734 check_min_window_sizes (); |
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; |
1742 } | 1744 } |
1743 | 1745 |
2606 maximum += (*sizefun) (next) - MINSIZE (next); | 2608 maximum += (*sizefun) (next) - MINSIZE (next); |
2607 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) | 2609 for (prev = p->prev; ! NILP (prev); prev = XWINDOW (prev)->prev) |
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; |
2615 | 2617 |
2616 next = p->next; | 2618 next = p->next; |