[Emacs-diffs] /srv/bzr/emacs/trunk r100035: composite.c (Ffind_composition_internal): Fix the return value for an automatic composition.

[Kenichi Handa]

------------------------------------------------------------
revno: 100035 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-26 21:03:28 +0900
message:
  composite.c (Ffind_composition_internal): Fix the return value for an 
automatic composition.
modified:
  src/ChangeLog
  src/composite.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-25 22:16:58 +0000
+++ b/src/ChangeLog     2010-04-26 12:02:08 +0000
@@ -1,3 +1,8 @@
+2010-04-26  Kenichi Handa  <address@hidden>
+
+       * composite.c (Ffind_composition_internal): Fix the return value
+       for an automatic composition.
+
 2010-04-25  Dan Nicolaescu  <address@hidden>
 
        Remove all NO_ARG_ARRAY uses.

=== modified file 'src/composite.c'
--- a/src/composite.c   2010-04-24 16:46:20 +0000
+++ b/src/composite.c   2010-04-26 12:02:08 +0000
@@ -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),