]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix typo in 'window_box_height'
authorMartin Rudalics <rudalics@gmx.at>
Sat, 4 Jan 2020 08:43:13 +0000 (09:43 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Sat, 4 Jan 2020 08:43:13 +0000 (09:43 +0100)
* src/xdisp.c (window_box_height): Add missing 'else'.

src/xdisp.c

index 4856a7b13b60717a8b81bbb2e7bb0fba22a4820a..3d286cb22fbd1abc40eb160920eb7ea227a58158 100644 (file)
@@ -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