*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index cf6b382b0d520199f2fe8f9bda68b22551db6330..d592bad9b52ea196cc8cd9c61aed6606ad9bd2fe 100644 (file)
--- 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 c618b6adc1e4282f373c2dc58aba4089b17fa225..1cc4679d8911c490b7b9525037540254e3383160 100644 (file)
--- 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,