From: Kenichi Handa <handa@m17n.org>
Date: Wed, 10 Sep 2008 12:02:36 +0000 (+0000)
Subject: (composition_compute_stop_pos): Reset cmp_it->id to -1 at first.
X-Git-Tag: emacs-pretest-23.0.90~2931
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=053ca52becabe78cab8cc30db5f9ca7c301cef04;p=emacs.git

(composition_compute_stop_pos): Reset cmp_it->id to -1 at first.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b8333c6bb25..13f878766df 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,7 @@
 	compose a grapheme cluster with the preceding base glyph.
 
 	* composite.c (composition_compute_stop_pos): Fix previous change.
+	Reset cmp_it->id to -1 at first.
 
 2008-09-10  Glenn Morris  <rgm@gnu.org>
 
diff --git a/src/composite.c b/src/composite.c
index be9871eef39..92e7a1e44cb 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1000,6 +1000,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
   if (endpos > charpos + MAX_NEWLINE_DISTANCE)
     endpos = charpos + MAX_NEWLINE_DISTANCE;
   cmp_it->stop_pos = endpos;
+  cmp_it->id = -1;
   cmp_it->ch = -2;
   if (find_composition (charpos, endpos, &start, &end, &prop, string)
       && COMPOSITION_VALID_P (start, end, prop))