From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Aug 2002 02:47:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~13644
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=775b3d2d87ef566e43f56b7dee53b5036d7eba02;p=emacs.git

*** empty log message ***
---

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,