From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 29 May 2015 14:21:07 +0000 (+0300)
Subject: Fix 2 more calculations of line height
X-Git-Tag: emacs-25.0.90~1840^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42a7b12bc774e1e211204f90aed77c9ca6ffd158;p=emacs.git

Fix 2 more calculations of line height

* src/xdisp.c (estimate_mode_line_height, handle_single_display_spec):
Use normal_char_height.
---

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)
 	  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 */
 	}