[Emacs-diffs] /srv/bzr/emacs/trunk r100903: font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of glyphs gets smaller than the original length.

[Kenichi Handa]

------------------------------------------------------------
revno: 100903 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Mon 2010-07-26 13:30:05 +0900
message:
  font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the number of 
glyphs gets smaller than the original length.
modified:
  src/ChangeLog
  src/font.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-26 00:43:58 +0000
+++ b/src/ChangeLog     2010-07-26 04:29:08 +0000
@@ -1,3 +1,8 @@
+2010-07-26  Kenichi Handa  <address@hidden>
+
+       * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the
+       number of glyphs gets smaller than the original length.
+
 2010-07-26  Juanma Barranquero  <address@hidden>
 
        * lread.c (unreadpure, mapatoms_1): Make static.

=== modified file 'src/font.c'
--- a/src/font.c        2010-07-23 17:50:14 +0000
+++ b/src/font.c        2010-07-26 04:29:08 +0000
@@ -4459,6 +4459,8 @@
     }
   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);