diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:44:48 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-05 11:44:48 -0800 |
| commit | f9094332287cf1434788f6407347265350ae5dd5 (patch) | |
| tree | dd0405f108e95f376d8b2927666de63135dd5594 /src/xdisp.c | |
| parent | bb2b857d1f03516e0923f3f4e18f5459fdfcf692 (diff) | |
| parent | 448df8fec7a7fb3fe558749591e657e8a84cb46b (diff) | |
| download | emacs-f9094332287cf1434788f6407347265350ae5dd5.tar.gz emacs-f9094332287cf1434788f6407347265350ae5dd5.tar.bz2 emacs-f9094332287cf1434788f6407347265350ae5dd5.zip | |
Merge from origin/emacs-27
448df8fec7 Improve doc-strings of 'quit-window' and 'quit-restore-win...
7f01dfca56 Fix MH-E bug #470: Show buffer discards text properties
f95a2b8301 Fix some broken conditional forms
28727444f1 Fix a scoping error in tramp-sudoedit.el
6cbdd048bd * lisp/autorevert.el (auto-revert-notify-handler): Fix bra...
076dd1f69a Fix typo in 'window_box_height'
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 723309a31d7..cc936ff179d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1136,16 +1136,17 @@ window_box_height (struct window *w) { if (w->header_line_height >= 0) height -= w->header_line_height; - { - struct glyph_row *hl_row - = (w->current_matrix && w->current_matrix->rows - ? MATRIX_HEADER_LINE_ROW (w->current_matrix) - : 0); - if (hl_row && hl_row->mode_line_p) - height -= hl_row->height; - else - height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); - } + else + { + struct glyph_row *hl_row + = (w->current_matrix && w->current_matrix->rows + ? MATRIX_HEADER_LINE_ROW (w->current_matrix) + : 0); + if (hl_row && hl_row->mode_line_p) + height -= hl_row->height; + else + height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); + } } /* With a very small font and a mode-line that's taller than |