summaryrefslogtreecommitdiff
path: root/lisp/use-package
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-03-19 14:20:09 -0500
committerJohn Wiegley <johnw@newartisans.com>2015-03-19 14:20:09 -0500
commit23ec1ca7190f0576f667a22731c3e5f09eb9654c (patch)
tree98a79803c251a10621f8397b4498c950779f4270 /lisp/use-package
parent1b6605652c0ecc20ed2ba30873f2c92721e999fd (diff)
parentf5f4102ca18916786169935ea05a3a486599ab77 (diff)
downloademacs-23ec1ca7190f0576f667a22731c3e5f09eb9654c.tar.gz
emacs-23ec1ca7190f0576f667a22731c3e5f09eb9654c.tar.bz2
emacs-23ec1ca7190f0576f667a22731c3e5f09eb9654c.zip
Merge pull request from npostavs/name-keymap
get-binding-description: return keymap symbol GitHub-reference: https://github.com/jwiegley/use-package/issues/184
Diffstat (limited to 'lisp/use-package')
-rw-r--r--lisp/use-package/bind-key.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index fd143888d5d..bf4e13b2189 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -234,12 +234,9 @@ function symbol (unquoted)."
"#<keymap>")
(t
elem)))
- ((keymapp elem)
- (if (and bind-key-describe-special-forms
- (symbolp elem)
- (get elem 'variable-documentation))
- (format "%s" (get elem 'variable-documentation))
- "#<keymap>"))
+ ;; must be a symbol, non-symbol keymap case covered above
+ ((and bind-key-describe-special-forms (keymapp elem))
+ (get elem 'variable-documentation))
((symbolp elem)
elem)
(t