diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-08-10 17:59:34 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-08-10 17:59:34 -0700 |
| commit | c7367d2de3343e56171c4fe6d439a3ed5f40d06c (patch) | |
| tree | 54fe9166f6b4320d9518bbac11e2d575a9fda7c2 /src/fontset.c | |
| parent | 6b7d077506304f440d311fa7b29d210b7a3e121c (diff) | |
| parent | f314e84fce8b394da20aa1d69121c74fb34f9a1e (diff) | |
| download | emacs-c7367d2de3343e56171c4fe6d439a3ed5f40d06c.tar.gz | |
Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c index e34719e5cdf..d99a3bcb7ef 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1843,6 +1843,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) |