1 files changed, 12 insertions, 1 deletions

diff --git a/src/font.c b/src/font.c
index b82a4d2a045..d88b1c592ff 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3382,7 +3382,18 @@ font_open_for_lface (f, entity, attrs, spec)
     size = font_pixel_size (f, spec);
   else
     {
-      double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
+      double pt;
+      if (INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
+        pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
+      else
+        {
+          struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+          Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
+          if (INTEGERP (height))
+            pt = XINT (height);
+          else
+            abort(); /* We should never end up here.  */
+        }
 
       pt /= 10;
       size = POINT_TO_PIXEL (pt, f->resy);