2 files changed, 6 insertions, 1 deletions

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  <eliz@gnu.org>
+
+        * 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  <schwab@linux-m68k.org>
 
         * 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++;