Merge from emacs-23 branch

[gnu-emacs] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index 577640f6fb74f746cec60e290dbbbf58dfcc0b75..cf1e053f0276aeb619033a883b0536bad8557212 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1026,6 +1026,7 @@ composition_compute_stop_pos (struct composition_it *cmp_it, EMACS_INT charpos,
   /* FIXME: Bidi is not yet handled well in static composition.  */
   if (charpos < endpos
       && find_composition (charpos, endpos, &start, &end, &prop, string)
+      && start >= charpos
       && COMPOSITION_VALID_P (start, end, prop))
     {
       cmp_it->stop_pos = endpos = start;