summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
+2015-02-09 Christopher Genovese <genovese@cmu.edu> (tiny change)
+
+ * help-fns.el (help-fns--signature): Keep doc for keymap.
+
2015-02-09 Kelly Dean <kelly@prtime.org>
* 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."
(insert ".\n"))))
(defun help-fns--signature (function doc real-def real-function)
- (unless (keymapp function) ; If definition is a keymap, skip arglist note.
+ "Insert usage at point and return docstring. With highlighting."
+ (if (keymapp function)
+ doc ; If definition is a keymap, skip arglist note.
(let* ((advertised (gethash real-def advertised-signature-table t))
(arglist (if (listp advertised)
advertised (help-function-arglist real-def)))