composite.c (Ffind_composition_internal): Fix the return value for an automatic composition.

fcebfc6a · Kenichi Handa · 39e2ad1b · fcebfc6a · fcebfc6a
Commit fcebfc6a authored Apr 26, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/composite.c src/composite.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2010-04-26  Kenichi Handa  <handa@m17n.org>
+
+	* composite.c (Ffind_composition_internal): Fix the return value
+	for an automatic composition.
+
 2010-04-25  Dan Nicolaescu  <dann@ics.uci.edu>
  
 	Remove all NO_ARG_ARRAY uses.

--- a/src/composite.c
+++ b/src/composite.c
@@ -1674,7 +1674,7 @@ See `find-composition' for more details.  */)

      if (find_automatic_composition (from, to, &s, &e, &gstring, string)
 	  && (e <= XINT (pos) ? e > end : s < start))
-	return list3 (make_number (start), make_number (end), gstring);
+	return list3 (make_number (s), make_number (e), gstring);
    }
  if (!COMPOSITION_VALID_P (start, end, prop))
    return Fcons (make_number (start), Fcons (make_number (end),