[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/large-fonts 42a7b12 3/4: Fix 2 more calculations o
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] scratch/large-fonts 42a7b12 3/4: Fix 2 more calculations of line height |
Date: |
Sat, 30 May 2015 09:34:12 +0000 |
branch: scratch/large-fonts
commit 42a7b12bc774e1e211204f90aed77c9ca6ffd158
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix 2 more calculations of line height
* src/xdisp.c (estimate_mode_line_height, handle_single_display_spec):
Use normal_char_height.
---
src/xdisp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 29b97ab..1fd84f8 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)
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 */
}