From: Kenichi Handa <handa@etlken>
Date: Mon, 26 Apr 2010 12:02:08 +0000 (+0900)
Subject: composite.c (Ffind_composition_internal): Fix the return value for an automatic compo... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fcebfc6a34b6b21435fdbe7e68269de6088d55c2;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 60b543765ad..db23a4a7cb3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/src/composite.c b/src/composite.c
index 82f31ade4a7..c714b403309 100644
--- 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),