Commit 9ac0394b authored by Kenichi Handa's avatar Kenichi Handa

xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496).

parent 0d92c7bf
2011-11-11 Johan Bockgård <bojohan@gnu.org>
* xdisp.c (fill_composite_glyph_string): Always set s->face, to
avoid a crash (bug#9496).
2011-11-07 Kenichi Handa <handa@m17n.org>
* coding.c (coding_set_destination): Check coding->src_pos only
......
......@@ -22121,6 +22121,12 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face,
}
s->cmp_to = i;
if (s->face == NULL)
{
s->face = base_face->ascii_face;
s->font = s->face->font;
}
/* All glyph strings for the same composition has the same width,
i.e. the width set for the first component of the composition. */
s->width = s->first_glyph->pixel_width;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment