]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix 2 more calculations of line height
authorEli Zaretskii <eliz@gnu.org>
Fri, 29 May 2015 14:21:07 +0000 (17:21 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 29 May 2015 14:21:07 +0000 (17:21 +0300)
* src/xdisp.c (estimate_mode_line_height, handle_single_display_spec):
Use normal_char_height.

src/xdisp.c

index 29b97abcb951c04616a6d90d30d4f42c13496af6..1fd84f8ade064d5cb50c0b03b6b07e258935cda8 100644 (file)
@@ -1762,7 +1762,7 @@ estimate_mode_line_height (struct frame *f, enum face_id face_id)
          if (face)
            {
              if (face->font)
-               height = FONT_HEIGHT (face->font);
+               height = normal_char_height (face->font);
              if (face->box_line_width > 0)
                height += 2 * face->box_line_width;
            }
@@ -4889,7 +4889,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
            {
              struct face *face = FACE_FROM_ID (it->f, it->face_id);
              it->voffset = - (XFLOATINT (value)
-                              * (FONT_HEIGHT (face->font)));
+                              * (normal_char_height (face->font)));
            }
 #endif /* HAVE_WINDOW_SYSTEM */
        }