From dfe3c90fa5974e200483297e11bb889d0589b8f5 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 26 Jul 2010 13:28:02 +0900 Subject: font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of glyphs gets smaller than the original length. --- src/ChangeLog | 5 +++++ src/font.c | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 414f22d3bf..7e79e65b0c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-07-26 Kenichi Handa + + * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the + number of glyphs gets smaller than the original length. + 2010-07-20 Juanma Barranquero * alloc.c (emacs_blocked_free, emacs_blocked_malloc) diff --git a/src/font.c b/src/font.c index cb3e9c5d32..ed4da9c75a 100644 --- a/src/font.c +++ b/src/font.c @@ -4492,6 +4492,8 @@ created glyph-string. Otherwise, the value is nil. */) } if (i == 3 || XINT (n) == 0) return Qnil; + if (XINT (n) < LGSTRING_GLYPH_LEN (gstring)) + LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil); glyph = LGSTRING_GLYPH (gstring, 0); from = LGLYPH_FROM (glyph); -- cgit v1.2.3