(composition_compute_stop_pos): Fix previous change.

diff --git a/src/composite.c b/src/composite.c
index eea2f9661b46137a69aae46872f9643e99f8b492..be9871eef398f2cc178c605ff121b826568d215a 100644 (file)
--- 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