diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-11-16 07:18:19 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-11-16 07:18:19 +0100 |
| commit | e0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf (patch) | |
| tree | a50f913bc47e2d9aae6fb535b1f96a0c9c56af3b /src/xfaces.c | |
| parent | d89d5e0f9466b9823fe31d02a374d654163594e4 (diff) | |
| parent | e852822f3db469c985bf022651f184d6ff2c518a (diff) | |
| download | emacs-e0abd83b4990bdfb8c8c4a518a5d0cc4f2d96bdf.tar.gz | |
Merge from origin/emacs-28
e852822f3d Fix removal of fringe marks of deleted bookmarks
b418aad85a * lisp/repeat.el (repeat-echo-message): Bind message-log-m...
fe2ac7cb7c * lisp/repeat.el (describe-repeat-maps): Use help-fns--ana...
c840bfe7e1 * lisp/repeat.el: Detect changes in the minibuffer state (...
5044151486 Avoid segfaults due to freed face cache
199e2468d3 Doc fix; change recommended file name of custom-file
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 442fcf47d3d..d0d73eb8286 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6381,7 +6381,10 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos, else face_id = lookup_basic_face (w, f, DEFAULT_FACE_ID); - default_face = FACE_FROM_ID (f, face_id); + default_face = FACE_FROM_ID_OR_NULL (f, face_id); + if (!default_face) + default_face = FACE_FROM_ID (f, + lookup_basic_face (w, f, DEFAULT_FACE_ID)); } /* Optimize common cases where we can use the default face. */ |