Commit bdb04e9d authored by Eli Zaretskii's avatar Eli Zaretskii

Fix aborts when opening a new font after face-cache reset

* src/font.c (font_open_for_lface): Make sure the default face
is realized before using its height for the font to be open.
(Bug#37637)
parent 005ed494
Pipeline #3505 failed with stage
in 76 minutes and 3 seconds
......@@ -3314,6 +3314,10 @@ font_open_for_lface (struct frame *f, Lisp_Object entity, Lisp_Object *attrs, Li
pt = XFIXNUM (attrs[LFACE_HEIGHT_INDEX]);
else
{
/* We need the default face to be valid below. */
if (FRAME_FACE_CACHE (f)->used == 0)
recompute_basic_faces (f);
struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
eassert (FIXNUMP (height));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment