From: Kenichi Handa <handa@m17n.org>
Date: Thu, 6 Dec 2007 07:25:56 +0000 (+0000)
Subject: (Ffont_shape_text): Fix the return value.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14065d35173fe7206397cf139227f8763c44c753;p=emacs.git

(Ffont_shape_text): Fix the return value.
---

diff --git a/src/font.c b/src/font.c
index 34987713cb2..7390a978162 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3453,18 +3453,15 @@ The value is the end position of the shaped text.  */)
       LGSTRING_SET_DESCENT (gstr, metrics.descent);
       for (k = i; i < j; i++)
 	LGSTRING_SET_GLYPH (gstr, i - k, LGSTRING_GLYPH (gstring, i));
+      from = make_number (start + this_from);
+      to = make_number (start + this_to);
       if (NILP (string))
-	Fcompose_region_internal (make_number (start + this_from),
-				  make_number (start + this_to),
-				  gstr, Qnil);
+	Fcompose_region_internal (from, to, gstr, Qnil);
       else
-	Fcompose_string_internal (string,
-				  make_number (start + this_from),
-				  make_number (start + this_to),
-				  gstr, Qnil);
+	Fcompose_string_internal (string, from, to, gstr, Qnil);
     }
 
-  return make_number (start + XINT (n));
+  return to;
 }
 
 DEFUN ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0,