diff options
| author | Richard M. Stallman | 2002-01-21 08:53:42 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2002-01-21 08:53:42 +0000 |
| commit | 54b8bcb515a96a1c6ef304809fd9087d3b73c653 (patch) | |
| tree | 24118a89a65941d9f5b62393d08b4f1f76072e98 /src | |
| parent | ca64d37890b48c8fe2f3820afedffe138cabc711 (diff) | |
| download | emacs-54b8bcb515a96a1c6ef304809fd9087d3b73c653.tar.gz emacs-54b8bcb515a96a1c6ef304809fd9087d3b73c653.zip | |
(check_frame_size): Fix minimum height calculation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/window.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index 9f7dd58f0cc..2340ec67aa2 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -2142,13 +2142,12 @@ check_frame_size (frame, rows, cols) | |||
| 2142 | int *rows, *cols; | 2142 | int *rows, *cols; |
| 2143 | { | 2143 | { |
| 2144 | /* For height, we have to see: | 2144 | /* For height, we have to see: |
| 2145 | whether the frame has a minibuffer, | 2145 | how many windows the frame has at minimum (one or two), |
| 2146 | whether it wants a mode line, and | 2146 | and whether it has a menu bar or other special stuff at the top. */ |
| 2147 | whether it has a menu bar. */ | 2147 | int min_height |
| 2148 | int min_height = | 2148 | = ((FRAME_MINIBUF_ONLY_P (frame) || ! FRAME_HAS_MINIBUF_P (frame)) |
| 2149 | (FRAME_MINIBUF_ONLY_P (frame) ? MIN_SAFE_WINDOW_HEIGHT - 1 | 2149 | ? MIN_SAFE_WINDOW_HEIGHT |
| 2150 | : (! FRAME_HAS_MINIBUF_P (frame)) ? MIN_SAFE_WINDOW_HEIGHT | 2150 | : 2 * MIN_SAFE_WINDOW_HEIGHT); |
| 2151 | : 2 * MIN_SAFE_WINDOW_HEIGHT - 1); | ||
| 2152 | 2151 | ||
| 2153 | if (FRAME_TOP_MARGIN (frame) > 0) | 2152 | if (FRAME_TOP_MARGIN (frame) > 0) |
| 2154 | min_height += FRAME_TOP_MARGIN (frame); | 2153 | min_height += FRAME_TOP_MARGIN (frame); |