aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2008-09-10 12:39:03 +0000
committerKenichi Handa2008-09-10 12:39:03 +0000
commitf83ef6536800d0c5553065909cbb8bd56471db2f (patch)
tree06985da2d47666b7515de45429ec832a94b8a17a
parent053ca52becabe78cab8cc30db5f9ca7c301cef04 (diff)
downloademacs-f83ef6536800d0c5553065909cbb8bd56471db2f.tar.gz
emacs-f83ef6536800d0c5553065909cbb8bd56471db2f.zip
(handle_composition_prop): Set it->cmp_it.ch to -1.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13f878766df..f084924ac7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12008-09-10 Kenichi Handa <handa@m17n.org> 12008-09-10 Kenichi Handa <handa@m17n.org>
2 2
3 * xdisp.c (handle_composition_prop): Set it->cmp_it.ch to -1.
4
3 * font.c (Ffont_shape_gstring): Make glyphs of non-nil adjustment 5 * font.c (Ffont_shape_gstring): Make glyphs of non-nil adjustment
4 compose a grapheme cluster with the preceding base glyph. 6 compose a grapheme cluster with the preceding base glyph.
5 7
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)
4679 4679
4680 if (it->cmp_it.id >= 0) 4680 if (it->cmp_it.id >= 0)
4681 { 4681 {
4682 it->cmp_it.ch = -1;
4682 it->cmp_it.nchars = COMPOSITION_LENGTH (prop); 4683 it->cmp_it.nchars = COMPOSITION_LENGTH (prop);
4683 it->cmp_it.nglyphs = -1; 4684 it->cmp_it.nglyphs = -1;
4684 } 4685 }