diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/composite.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cf6b382b0d5..d592bad9b52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/composite.c b/src/composite.c index c618b6adc1e..1cc4679d891 100644 --- a/src/composite.c +++ b/src/composite.c @@ -462,7 +462,7 @@ run_composition_function (from, to, prop) && 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, |