[Emacs-diffs] /srv/bzr/emacs/trunk r108954: Fix bug #11813 with invalid font for buffer name on the modeline.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108954
fixes bug: http://debbugs.gnu.org/11813
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-08 18:49:39 +0300
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-07 23:16:19 +0000
+++ b/src/ChangeLog     2012-07-08 15:49:39 +0000
@@ -1,3 +1,8 @@
+2012-07-08  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (display_line): Avoid warning about implicit declaration

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-07 21:39:45 +0000
+++ b/src/xdisp.c       2012-07-08 15:49:39 +0000
@@ -22736,7 +22736,7 @@
   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++;