# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 954643332 0
# Node ID bae9218986acc57b1e8f44b3182e8a86f0a0f3f7
# Parent  f3d784d3eb5d17a52a6d32462f1f684e608f7744
* 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 -r f3d784d3eb5d -r bae9218986ac src/ChangeLog
Binary file src/ChangeLog has changed
diff -r f3d784d3eb5d -r bae9218986ac src/composite.c
--- a/src/composite.c	Sun Apr 02 02:33:22 2000 +0000
+++ b/src/composite.c	Sun Apr 02 02:42:12 2000 +0000
@@ -456,7 +456,7 @@
     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 @@
 
   /* 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 @@
     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);
   }