diff options
| author | Martin Rudalics <[email protected]> | 2007-10-26 20:50:17 +0000 |
|---|---|---|
| committer | Martin Rudalics <[email protected]> | 2007-10-26 20:50:17 +0000 |
| commit | b6ff295c434269fe824ec47cbfc87c6a02dfd94d (patch) | |
| tree | 08e7b57b3ba75f33a55e2282e3b4dbe4170d309e | |
| parent | 70cd9104ca2f1f7443cda004d9ab576d49503aca (diff) | |
(window_min_size_2): Don't count header-line.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 86f77fabd0..0599566386 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-10-26 Martin Rudalics <[email protected]> + + * window.c (window_min_size_2): Don't count header-line. + 2007-10-25 Juanma Barranquero <[email protected]> * w32.c (init_environment): Fix tiny memory leak. diff --git a/src/window.c b/src/window.c index 6fe78166ba..4e8ad69950 100644 --- a/src/window.c +++ b/src/window.c @@ -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; } |