* composite.c (run_composite_function): Use NILP when checking for nil.

(syms_of_composite): Delete local var NARGS, pass an int as first argument to
Fmake_hash_table.

diff --git a/src/ChangeLog b/src/ChangeLog
index db9fe4caeb0aeb474a77501b461f8e79337722f9..de883b830a4c6018ce5a32236edbd94a85724a1d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,11 @@
        (make_number): Define as a function if it's not defined as a
        macro.
 
+       * composite.c (run_composite_function): Use NILP when checking for
+       nil.
+       (syms_of_composite): Delete local var NARGS, pass an int as first
+       argument to Fmake_hash_table.
+
        * editfns.c (text_property_stickiness): Use NILP to test
        Lisp_Object boolean value.
        (Fmessage_or_box): Don't use NILP to test int variable.

diff --git a/src/composite.c b/src/composite.c
index 335fbc103cf6cc2229b6dd9849b8177e08a966a4..440bce3b41ff4dd26733d7ecdd51d1ea50d0b8b2 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -456,7 +456,7 @@ run_composition_function (from, to, prop)
     to = end;
   if (!NILP (func))
     call2 (func, make_number (from), make_number (to));
-  else if (Ffboundp (Vcompose_chars_after_function))
+  else if (!NILP (Ffboundp (Vcompose_chars_after_function)))
     call2 (Vcompose_chars_after_function,
           make_number (from), make_number (to));
 }
@@ -670,7 +670,7 @@ syms_of_composite ()
 
   /* Make a hash table for composition.  */
   {
-    Lisp_Object args[6], nargs;
+    Lisp_Object args[6];
     extern Lisp_Object QCsize;
     
     args[0] = QCtest;
@@ -679,8 +679,7 @@ syms_of_composite ()
     args[3] = Qnil;
     args[4] = QCsize;
     args[5] = make_number (311);
-    XSETINT (nargs, 6);
-    composition_hash_table = Fmake_hash_table (nargs, args);
+    composition_hash_table = Fmake_hash_table (6, args);
     staticpro (&composition_hash_table);
   }