Mercurial > emacs
changeset 91192:bcad98389aeb
(Ffont_shape_text): Fix the return value.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 06 Dec 2007 07:25:56 +0000 |
| parents | 5bce041b93dc |
| children | f93f0b835e32 |
| files | src/font.c |
| diffstat | 1 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/font.c Thu Dec 06 07:25:29 2007 +0000 +++ b/src/font.c Thu Dec 06 07:25:56 2007 +0000 @@ -3453,18 +3453,15 @@ 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,