diff options
| author | Kenichi Handa <handa@etlken> | 2010-04-26 21:02:08 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@etlken> | 2010-04-26 21:02:08 +0900 |
| commit | fcebfc6a34b6b21435fdbe7e68269de6088d55c2 (patch) | |
| tree | 99742b2c03cda09574cb3ba458c68c07cbdedd45 /src | |
| parent | 39e2ad1b9fef5b0437ed18c77bd703003a2b8e54 (diff) | |
| download | emacs-fcebfc6a34b6b21435fdbe7e68269de6088d55c2.tar.gz | |
composite.c (Ffind_composition_internal): Fix the return value for an automatic composition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/composite.c | 2 |
2 files changed, 6 insertions, 1 deletions
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), |