2 files changed, 22 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 899ab49923a..424b5945a27 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
 2001-11-19  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * syntax.c (describe_syntax): Add dummy arg.
+        (describe_syntax_1): Update call to describe_vector.
+
+        * category.c (describe_category): Add dummy arg.
+        (describe_category_1): Update call to describe_vector.
+
+        * keymap.c (Fdescribe_vector): Add `describer' parameter.
+        (describe_command, describe_translation): Add dummy second param.
+        (describe_map): Call elt_describer with two arguments.
+        (describe_vector_princ): Add `fun' parameter.
+        Call it instead of the hardcoded `princ'.
+        (describe_vector): Add arg `args'.
+        Pass it as a new second argument to elt_describer.
+
+        * keymap.h (describe_vector): Update prototype.
+
         * frame.c: Don't include keymap.h any more.
         (keys_of_frame): Remove.
 
diff --git a/src/syntax.c b/src/syntax.c
index 96ff69084f0..d82c88dcf18 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1173,8 +1173,8 @@ DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
 
 
 static void
-describe_syntax (value)
-    Lisp_Object value;
+describe_syntax (value, args)
+    Lisp_Object value, args;
 {
   Findent_to (make_number (16), make_number (1));
   Finternal_describe_syntax_value (value);
@@ -1188,13 +1188,14 @@ describe_syntax_1 (vector)
 {
   struct buffer *old = current_buffer;
   set_buffer_internal (XBUFFER (Vstandard_output));
-  describe_vector (vector, Qnil, describe_syntax, 0, Qnil, Qnil, (int *) 0, 0);
+  describe_vector (vector, Qnil, Qnil, describe_syntax,
+                   0, Qnil, Qnil, NULL, 0);
   while (! NILP (XCHAR_TABLE (vector)->parent))
     {
       vector = XCHAR_TABLE (vector)->parent;
       insert_string ("\nThe parent syntax table is:");
-      describe_vector (vector, Qnil, describe_syntax, 0, Qnil, Qnil,
-                       (int *) 0, 0);
+      describe_vector (vector, Qnil, Qnil, describe_syntax,
+                       0, Qnil, Qnil, NULL, 0);
     }
         
   call0 (intern ("help-mode"));