diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2007-10-26 20:57:07 +0000 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2007-10-26 20:57:07 +0000 |
| commit | 67b73e3aa76d9854b3be5f7a2c1075fb24a21074 (patch) | |
| tree | a188153222f49c69b75bd525f758c47569642677 | |
| parent | 72229917b19701499430f1e6dc5ab401aecd5c99 (diff) | |
| download | emacs-67b73e3aa76d9854b3be5f7a2c1075fb24a21074.tar.gz | |
(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 012573bc760..3ec3e4a9421 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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-26 Dan Nicolaescu <dann@ics.uci.edu> * frame.h (struct frame): Move all bit fields after the first bit diff --git a/src/window.c b/src/window.c index 1819b2dc024..0395f8f300d 100644 --- a/src/window.c +++ b/src/window.c @@ -2690,9 +2690,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) @@ -2711,8 +2710,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; } |