# HG changeset patch # User Kenichi Handa # Date 1272283328 -32400 # Node ID fb2072139c8067644a4088865a91b7ae4c4aadcd # Parent 8cf84fb217ccd2c2a48ba2051b3541adeb279d17 composite.c (Ffind_composition_internal): Fix the return value for an automatic composition. diff -r 8cf84fb217cc -r fb2072139c80 src/ChangeLog --- a/src/ChangeLog Mon Apr 26 10:22:02 2010 +0900 +++ b/src/ChangeLog Mon Apr 26 21:02:08 2010 +0900 @@ -1,3 +1,8 @@ +2010-04-26 Kenichi Handa + + * composite.c (Ffind_composition_internal): Fix the return value + for an automatic composition. + 2010-04-25 Dan Nicolaescu Remove all NO_ARG_ARRAY uses. diff -r 8cf84fb217cc -r fb2072139c80 src/composite.c --- a/src/composite.c Mon Apr 26 10:22:02 2010 +0900 +++ b/src/composite.c Mon Apr 26 21:02:08 2010 +0900 @@ -1674,7 +1674,7 @@ 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),