aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Genovese2015-02-09 09:04:47 -0500
committerStefan Monnier2015-02-09 09:04:47 -0500
commitad4f6708116bc8bcbb034bddc0e460eecc23c08f (patch)
treef8fb09d5145a6c996b8e9c6ff3ac19885bf4cc2a
parentc96983efef178d104a98bb900dda2087df80b172 (diff)
downloademacs-ad4f6708116bc8bcbb034bddc0e460eecc23c08f.tar.gz
emacs-ad4f6708116bc8bcbb034bddc0e460eecc23c08f.zip
* lisp/help-fns.el (help-fns--signature): Keep doc for keymap.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/help-fns.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4b1fff4373..9ca0c306e44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-02-09 Christopher Genovese <genovese@cmu.edu> (tiny change)
2
3 * help-fns.el (help-fns--signature): Keep doc for keymap.
4
12015-02-09 Kelly Dean <kelly@prtime.org> 52015-02-09 Kelly Dean <kelly@prtime.org>
2 6
3 * desktop.el: Save mark-ring less verbosely. 7 * desktop.el: Save mark-ring less verbosely.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 61e8d54acb3..7ecd271d0c8 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -352,7 +352,9 @@ suitable file is found, return nil."
352 (insert ".\n")))) 352 (insert ".\n"))))
353 353
354(defun help-fns--signature (function doc real-def real-function) 354(defun help-fns--signature (function doc real-def real-function)
355 (unless (keymapp function) ; If definition is a keymap, skip arglist note. 355 "Insert usage at point and return docstring. With highlighting."
356 (if (keymapp function)
357 doc ; If definition is a keymap, skip arglist note.
356 (let* ((advertised (gethash real-def advertised-signature-table t)) 358 (let* ((advertised (gethash real-def advertised-signature-table t))
357 (arglist (if (listp advertised) 359 (arglist (if (listp advertised)
358 advertised (help-function-arglist real-def))) 360 advertised (help-function-arglist real-def)))