From 8db811eff1b890cfc12e065d86a9f93bf974e364 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 7 Aug 2014 18:18:10 +0300 Subject: [PATCH] Fix bug #18162 with assertion violations due to empty face cache. src/fontset.c (Finternal_char_font): Recompute basic faces if the frame's face cache was cleared. --- src/ChangeLog | 5 +++++ src/fontset.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index de56e3501d8..a3ebe781be5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-08-07 Eli Zaretskii + + * fontset.c (Finternal_char_font): Recompute basic faces if the + frame's face cache was cleared. (Bug#18162) + 2014-08-05 Dmitry Antipov Fix bug with uninitialized undo list of an indirect buffer (Bug#18180). diff --git a/src/fontset.c b/src/fontset.c index 13f5357be64..08413ae1571 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1860,6 +1860,10 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, return Qnil; if (!FRAME_WINDOW_P (f)) return Qnil; + /* We need the basic faces to be valid below, so recompute them if + some code just happened to clear the face cache. */ + if (FRAME_FACE_CACHE (f)->used == 0) + recompute_basic_faces (f); face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil); face = FACE_FROM_ID (f, face_id); if (face->font) -- 2.11.4.GIT