mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 23:31:55 -08:00
Code Issues Projects Releases Wiki Activity

(window_min_size_2): Don't count header-line.

Browse source
This commit is contained in:
Martin Rudalics 2007-10-26 20:50:17 +00:00
parent 70cd9104ca
commit b6ff295c43
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2007-10-26 Martin Rudalics <rudalics@gmx.at>
* window.c (window_min_size_2): Don't count header-line.
2007-10-25 Juanma Barranquero <lekktu@gmail.com>
* w32.c (init_environment): Fix tiny memory leak.

12
src/window.c
View file

@ -2665,9 +2665,8 @@ window_fixed_size_p (w, width_p, check_siblings_p)
}
/* Return the minimum size for leaf window W. WIDTH_P non-zero means
take into account fringes and the scrollbar of W. WIDTH_P zero
means take into account mode-line and header-line of W. Return 1
for the minibuffer. */
take into account fringes and the scrollbar of W. WIDTH_P zero means
take into account mode-line of W. Return 1 for the minibuffer. */
static int
window_min_size_2 (w, width_p)
@ -2686,8 +2685,11 @@ window_min_size_2 (w, width_p)
else
size = max (window_min_height,
(MIN_SAFE_WINDOW_HEIGHT
+ (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)
+ (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 )));
/* Don't count the header-line here. It would break
splitting a window with a header-line when the new
window shall have a height of two (calculator does
that). */
+ (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)));
return size;
}