diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-25 14:24:17 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-25 14:24:17 +0800 |
| commit | d5cccfdc564f1486431f9674503c794df33d7fbc (patch) | |
| tree | 351dc3a1bd2ca77e45b41bf7f209d238e0d4c6cb /src/xfaces.c | |
| parent | ea74f3c0678d0729a8d6307e35c2d228f665afa3 (diff) | |
| parent | 50b55656b9c5ce0d7940bec245f2d9725378d0a0 (diff) | |
| download | emacs-d5cccfdc564f1486431f9674503c794df33d7fbc.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 4207b73ee25..953e5be3781 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4223,7 +4223,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). */ |