mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-17 08:31:09 -08:00
(check_frame_size): Fix minimum height calculation.
This commit is contained in:
parent
ca64d37890
commit
54b8bcb515
1 changed files with 6 additions and 7 deletions
13
src/window.c
13
src/window.c
|
|
@ -2142,13 +2142,12 @@ check_frame_size (frame, rows, cols)
|
|||
int *rows, *cols;
|
||||
{
|
||||
/* For height, we have to see:
|
||||
whether the frame has a minibuffer,
|
||||
whether it wants a mode line, and
|
||||
whether it has a menu bar. */
|
||||
int min_height =
|
||||
(FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1
|
||||
: (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT
|
||||
: 2 * MIN_SAFE_WINDOW_HEIGHT - 1);
|
||||
how many windows the frame has at minimum (one or two),
|
||||
and whether it has a menu bar or other special stuff at the top. */
|
||||
int min_height
|
||||
= ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame))
|
||||
? MIN_SAFE_WINDOW_HEIGHT
|
||||
: 2 * MIN_SAFE_WINDOW_HEIGHT);
|
||||
|
||||
if (FRAME_TOP_MARGIN (frame) > 0)
|
||||
min_height += FRAME_TOP_MARGIN (frame);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue