summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xdisp.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 2c38aa9ccff..863d891c2de 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13383,6 +13383,8 @@ redisplay_internal (void)
pending = false;
forget_escape_and_glyphless_faces ();
+ inhibit_free_realized_faces = false;
+
/* If face_change, init_iterator will free all realized faces, which
includes the faces referenced from current matrices. So, we
can't reuse current matrices in this case. */
@@ -13871,6 +13873,10 @@ redisplay_internal (void)
if (sf->fonts_changed)
goto retry;
+ /* Prevent freeing of realized faces, since desired matrices are
+ pending that reference the faces we computed and cached. */
+ inhibit_free_realized_faces = true;
+
/* Prevent various kinds of signals during display update.
stdio is not robust about handling signals,
which can cause an apparent I/O error. */