(describe-function-1): Skip arglist note if

function's definition is a keymap.

2 files changed, 14 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0445f3e7517..20c2c57a46d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06  John Paul Wallington  <jpw@shootybangbang.com>
+
+        * help-fns.el (describe-function-1): Skip arglist note if
+        function's definition is a keymap.
+
 2002-08-06  Sam Steingold  <sds@gnu.org>
 
         * calendar/diary-lib.el (diary-mail-entries): Use `compose-mail'
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index cdbc13f6781..ba543070bc9 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -300,13 +300,15 @@ Return (USAGE . DOC) or nil if there's no usage info."
     (let* ((arglist (help-function-arglist def))
            (doc (documentation function))
            usage)
-      (princ (cond
-              ((listp arglist) (help-make-usage function arglist))
-              ((stringp arglist) arglist)
-              ((and doc (subrp def) (setq usage (help-split-fundoc doc def)))
-               (setq doc (cdr usage)) (car usage))
-              (t "[Missing arglist.  Please make a bug report.]")))
-      (terpri)
+      ;; If definition is a keymap, skip arglist note.
+      (unless (keymapp def)
+        (princ (cond
+                ((listp arglist) (help-make-usage function arglist))
+                ((stringp arglist) arglist)
+                ((and doc (subrp def) (setq usage (help-split-fundoc doc def)))
+                 (setq doc (cdr usage)) (car usage))
+                (t "[Missing arglist.  Please make a bug report.]")))
+        (terpri))
       (let ((obsolete (and
                        ;; function might be a lambda construct.
                        (symbolp function)