aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2015-05-29 17:21:07 +0300
committerEli Zaretskii2015-05-29 17:21:07 +0300
commit42a7b12bc774e1e211204f90aed77c9ca6ffd158 (patch)
treee824807d80e3d9f195152f62e325046b5abe82b2 /src
parent5f734fa045c7d10c46c3a25ddd6e5f3d6b45182a (diff)
downloademacs-42a7b12bc774e1e211204f90aed77c9ca6ffd158.tar.gz
emacs-42a7b12bc774e1e211204f90aed77c9ca6ffd158.zip
Fix 2 more calculations of line height
* src/xdisp.c (estimate_mode_line_height, handle_single_display_spec): Use normal_char_height.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 29b97abcb95..1fd84f8ade0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1762,7 +1762,7 @@ estimate_mode_line_height (struct frame *f, enum face_id face_id)
1762 if (face) 1762 if (face)
1763 { 1763 {
1764 if (face->font) 1764 if (face->font)
1765 height = FONT_HEIGHT (face->font); 1765 height = normal_char_height (face->font);
1766 if (face->box_line_width > 0) 1766 if (face->box_line_width > 0)
1767 height += 2 * face->box_line_width; 1767 height += 2 * face->box_line_width;
1768 } 1768 }
@@ -4889,7 +4889,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
4889 { 4889 {
4890 struct face *face = FACE_FROM_ID (it->f, it->face_id); 4890 struct face *face = FACE_FROM_ID (it->f, it->face_id);
4891 it->voffset = - (XFLOATINT (value) 4891 it->voffset = - (XFLOATINT (value)
4892 * (FONT_HEIGHT (face->font))); 4892 * (normal_char_height (face->font)));
4893 } 4893 }
4894#endif /* HAVE_WINDOW_SYSTEM */ 4894#endif /* HAVE_WINDOW_SYSTEM */
4895 } 4895 }