Fix display of composite characters with large fonts

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 577b97920f47d2e6a3842c52273ee3b24739592a..e942eef3006a7ccb79ad058801babd21d37f479b 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -732,9 +732,11 @@ composition_gstring_width (Lisp_Object gstring, ptrdiff_t from, ptrdiff_t to,
       if (FONT_OBJECT_P (font_object))
        {
          struct font *font = XFONT_OBJECT (font_object);
+         int font_ascent, font_descent;
 
-         metrics->ascent = font->ascent;
-         metrics->descent = font->descent;
+         get_font_ascent_descent (font, &font_ascent, &font_descent);
+         metrics->ascent = font_ascent;
+         metrics->descent = font_descent;
        }
       else
        {