From: Kenichi Handa Date: Wed, 10 Sep 2008 12:39:03 +0000 (+0000) Subject: (handle_composition_prop): Set it->cmp_it.ch to -1. X-Git-Tag: emacs-pretest-23.0.90~2930 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f83ef6536800d0c5553065909cbb8bd56471db2f;p=emacs.git (handle_composition_prop): Set it->cmp_it.ch to -1. --- diff --git a/src/ChangeLog b/src/ChangeLog index 13f878766df..f084924ac7b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2008-09-10 Kenichi Handa + * xdisp.c (handle_composition_prop): Set it->cmp_it.ch to -1. + * font.c (Ffont_shape_gstring): Make glyphs of non-nil adjustment compose a grapheme cluster with the preceding base glyph. diff --git a/src/xdisp.c b/src/xdisp.c index a6d1a82eb33..314c29ee350 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4679,6 +4679,7 @@ handle_composition_prop (it) if (it->cmp_it.id >= 0) { + it->cmp_it.ch = -1; it->cmp_it.nchars = COMPOSITION_LENGTH (prop); it->cmp_it.nglyphs = -1; }