procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid crashes in batch mode due to lack of frame face cache

Browse source 
* src/xfaces.c (Finternal_merge_in_global_face): Handle frames
with no face cache.
This commit is contained in:
Eli Zaretskii 2023-02-24 22:46:05 +02:00
parent 244a73cd72
commit 146bce4932
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xfaces.c
View file

@ -4186,7 +4186,9 @@ Default face attributes override any local face attributes. */)
if (EQ (face, Qdefault))
{
struct face_cache *c = FRAME_FACE_CACHE (f);
struct face *newface, *oldface = FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID);
struct face *newface;
struct face *oldface =
c ? FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID) : NULL;
Lisp_Object attrs[LFACE_VECTOR_SIZE];
/* This can be NULL (e.g., in batch mode). */