Merge from origin/emacs-30

a0f740c88d8 ; * lisp/progmodes/flymake.el: Fix "Maintainer" header
a9433858131 ; * etc/AUTHORS: Update.
762b85be27b ; Revert "; * admin/authors.el (authors-valid-file-names)...
e24d568b565 ; Revert "Revert "; * admin/authors.el (authors-ignored-f...
2d723a280b3 Revert "; * admin/authors.el (authors-ignored-files): Add...
2a5b129509f Revert "; * admin/authors.el (authors-ignored-files): Ign...
0db53f14a29 ; * admin/authors.el (authors-ignored-files): Ignore Unic...
6734b60c0c3 ; * admin/authors.el (authors-valid-file-names): Ignore U...
d809d53afc0 ; * admin/authors.el (authors-ignored-files): Add removed...
766f69bab12 ; * etc/NEWS: Announce VC-dir "Tracking" header. (bug#68183)
37a097d8663 ; * admin/authors.el (authors-aliases): Fix regexps.
0fb50e26316 ; * admin/MAINTAINERS: Spencer Baugh maintains flymake.el.
d05d8c336c8 xwidget: Fix xwidget-at misinterpreting non-xwidget text-...
13f69f254cf Fix rare segfaults due to freed fontsets
427fb319dab ; * lisp/simple.el (use-region-beginning, use-region-end)...

# Conflicts:
#	admin/MAINTAINERS
#	etc/NEWS

1 files changed, 9 insertions, 0 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 684b6ccfac7..bbc3448e457 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -733,9 +733,18 @@ recompute_basic_faces (struct frame *f)
 {
   if (FRAME_FACE_CACHE (f))
     {
+      bool non_basic_faces_cached =
+        FRAME_FACE_CACHE (f)->used > BASIC_FACE_ID_SENTINEL;
       clear_face_cache (false);
       if (!realize_basic_faces (f))
         emacs_abort ();
+      /* The call to realize_basic_faces above recomputed the basic
+         faces and freed their fontsets, but if there are non-ASCII
+         faces in the cache, they might now be invalid, and they
+         reference fontsets that are no longer in Vfontset_table.  We
+         therefore must force complete regeneration of all frame faces.  */
+      if (non_basic_faces_cached)
+        f->face_change = true;
     }
 }