Mercurial > emacs
changeset 46940:545e543e82d5
*** empty log message ***
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 19 Aug 2002 02:47:19 +0000 |
parents | 6c76daadf530 |
children | 1241ed1e9eee |
files | src/ChangeLog src/composite.c |
diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 19 02:46:28 2002 +0000 +++ b/src/ChangeLog Mon Aug 19 02:47:19 2002 +0000 @@ -1,3 +1,11 @@ +2002-08-19 Kenichi Handa <handa@localhost> + + * composite.c (run_composition_function): Call FUNC if it is + fboundp. + + * composite.h (COMPOSITION_MODIFICATION_FUNC): If PROP is not a + cons, return Qnil. + 2002-08-17 Richard M. Stallman <rms@gnu.org> * s/sol2-5.h (BROKEN_SIGIO): Add #undef.
--- a/src/composite.c Mon Aug 19 02:46:28 2002 +0000 +++ b/src/composite.c Mon Aug 19 02:47:19 2002 +0000 @@ -462,7 +462,7 @@ && find_composition (to, -1, &start, &end, &prop, Qnil) && !COMPOSITION_VALID_P (start, end, prop)) to = end; - if (!NILP (Ffbounpd (func))) + if (!NILP (Ffboundp (func))) call2 (func, make_number (from), make_number (to)); else if (!NILP (Ffboundp (Vcompose_chars_after_function))) call3 (Vcompose_chars_after_function,