Commit 5a3e96b1 authored by Paul Eggert's avatar Paul Eggert

Add eassert check for bad default face

* src/xdisp.c (append_space_for_newline): Add an eassert check
that default_face is not null, by calling FACE_FROM_ID instead of
FACE_FROM_ID_OR_NULL.  Initialize a local only if needed.
parent 603a7c8a
Pipeline #4150 failed with stage
in 60 minutes and 21 seconds
...@@ -21395,12 +21395,12 @@ append_space_for_newline (struct it *it, bool default_face_p) ...@@ -21395,12 +21395,12 @@ append_space_for_newline (struct it *it, bool default_face_p)
{ {
const int local_default_face_id = const int local_default_face_id =
lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID); lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID);
struct face* default_face =
FACE_FROM_ID_OR_NULL (it->f, local_default_face_id);
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
if (FRAME_WINDOW_P (it->f)) if (FRAME_WINDOW_P (it->f))
{ {
struct face *default_face
= FACE_FROM_ID (it->f, local_default_face_id);
struct font *font = (default_face->font struct font *font = (default_face->font
? default_face->font ? default_face->font
: FRAME_FONT (it->f)); : FRAME_FONT (it->f));
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