Merge from origin/emacs-26

bd1d617 Avoid race in rcirc process filter (bug#33145)
88ef31a Avoid file-name errors when viewing PDF from Gnus
c939042 Avoid crashes with remapped default face in Org mode
97660fa Doc fix for checkdoc-continue
96f055b Fix a typo in autoload.el

1 files changed, 8 insertions, 1 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 6e06d56ba1d..94397cd7f99 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6093,7 +6093,14 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
     int face_id;
 
     if (base_face_id >= 0)
-      face_id = base_face_id;
+      {
+        face_id = base_face_id;
+        /* Make sure the base face ID is usable: if someone freed the
+           cached faces since we've looked up the base face, we need
+           to look it up again.  */
+        if (!FACE_FROM_ID_OR_NULL (f, face_id))
+          face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+      }
     else if (NILP (Vface_remapping_alist))
       face_id = DEFAULT_FACE_ID;
     else