procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #11813 with invalid font for buffer name on the modeline.

Browse source 
src/xdisp.c (fill_glyphless_glyph_string): If the face of the glyph
 has no font, use the frame's font.
This commit is contained in:
Eli Zaretskii 2012-07-08 18:49:39 +03:00
parent 9d6fa7c706
commit c4b3bc8aaf
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

2
src/xdisp.c
View file

@ -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++;