aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 4856a7b13b6..3d286cb22fb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1136,16 +1136,17 @@ window_box_height (struct window *w)
1136 { 1136 {
1137 if (w->header_line_height >= 0) 1137 if (w->header_line_height >= 0)
1138 height -= w->header_line_height; 1138 height -= w->header_line_height;
1139 { 1139 else
1140 struct glyph_row *hl_row 1140 {
1141 = (w->current_matrix && w->current_matrix->rows 1141 struct glyph_row *hl_row
1142 ? MATRIX_HEADER_LINE_ROW (w->current_matrix) 1142 = (w->current_matrix && w->current_matrix->rows
1143 : 0); 1143 ? MATRIX_HEADER_LINE_ROW (w->current_matrix)
1144 if (hl_row && hl_row->mode_line_p) 1144 : 0);
1145 height -= hl_row->height; 1145 if (hl_row && hl_row->mode_line_p)
1146 else 1146 height -= hl_row->height;
1147 height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID); 1147 else
1148 } 1148 height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID);
1149 }
1149 } 1150 }
1150 1151
1151 /* With a very small font and a mode-line that's taller than 1152 /* With a very small font and a mode-line that's taller than