From c4b3bc8aaf01a9e3fdd14072ae49316ae4fb4f3b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 8 Jul 2012 18:49:39 +0300 Subject: [PATCH] Fix bug #11813 with invalid font for buffer name on the modeline. src/xdisp.c (fill_glyphless_glyph_string): If the face of the glyph has no font, use the frame's font. --- src/ChangeLog | 5 +++++ src/xdisp.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2ac0f54612b..2fc91007719 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-08 Eli Zaretskii + + * xdisp.c (fill_glyphless_glyph_string): If the face of the glyph + has no font, use the frame's font. (Bug#11813) + 2012-07-07 Andreas Schwab * xdisp.c (display_line): Avoid warning about implicit declaration diff --git a/src/xdisp.c b/src/xdisp.c index 2b2765e7f93..3a485f6a5a9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22736,7 +22736,7 @@ fill_glyphless_glyph_string (struct glyph_string *s, int face_id, last = s->row->glyphs[s->area] + end; voffset = glyph->voffset; s->face = FACE_FROM_ID (s->f, face_id); - s->font = s->face->font; + s->font = s->face->font ? s->face->font : FRAME_FONT (s->f); s->nchars = 1; s->width = glyph->pixel_width; glyph++; -- 2.39.2