From 44566dc7f2c4d9881b614541ce19398b745659cd Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 10 Sep 2008 01:36:19 +0000 Subject: [PATCH] (composition_compute_stop_pos): Fix previous change. --- src/composite.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/composite.c b/src/composite.c index eea2f9661b4..be9871eef39 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->ch = -2; if (find_composition (charpos, endpos, &start, &end, &prop, string) && COMPOSITION_VALID_P (start, end, prop)) { @@ -1043,15 +1044,12 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string) cmp_it->lookback = XFASTINT (AREF (elt, 1)); cmp_it->stop_pos = charpos - 1 - cmp_it->lookback; cmp_it->ch = c; - break; + return; } } } - if (charpos == endpos) - { - cmp_it->stop_pos = endpos; - cmp_it->ch = -2; - } + cmp_it->stop_pos = charpos; + cmp_it->ch = -2; } /* Check if the character at CHARPOS (and BYTEPOS) is composed -- 2.39.5