# HG changeset patch # User Kenichi Handa # Date 1272283408 -32400 # Node ID 769f66a9a7ef80812a72ba7caf0bf49fb844a5b1 # Parent 641672d44942b162321288f686f50464074b588d# Parent fb2072139c8067644a4088865a91b7ae4c4aadcd composite.c (Ffind_composition_internal): Fix the return value for an automatic composition. diff -r 641672d44942 -r 769f66a9a7ef src/ChangeLog --- a/src/ChangeLog Sun Apr 25 15:16:58 2010 -0700 +++ b/src/ChangeLog Mon Apr 26 21:03:28 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 641672d44942 -r 769f66a9a7ef src/composite.c --- a/src/composite.c Sun Apr 25 15:16:58 2010 -0700 +++ b/src/composite.c Mon Apr 26 21:03:28 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),