aboutsummaryrefslogtreecommitdiffhomepage
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Mark Walters <markwalters1009@gmail.com>2013-11-12 20:10:53 +0000
committerGravatar David Bremner <david@tethera.net>2013-11-13 21:33:05 -0400
commita5ecdf390e4dca6a314cee1594ab3236ea62ca85 (patch)
tree978b7fedb290f5d93a791e9f25ebd8f5baf8c03e /emacs
parent9ecfc1c42664f7ffe68fc5f13d7011c40becaab0 (diff)
emacs: help: check for nil key binding
A standard way to unset a key binding is local-unset-key which is equivalent to (define-key (current-local-map) key nil) Currently notmuch-help gives an error and fails if a user has done this. To fix this we only add a help line if the binding is non-nil.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/notmuch-lib.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index bc695119..4c615474 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -253,7 +253,7 @@ prefix argument. PREFIX and TAIL are used internally."
(setq tail
(notmuch-describe-keymap
binding ua-keys (notmuch-prefix-key-description key) tail)))
- (t
+ (binding
(when (and ua-keys (symbolp binding)
(get binding 'notmuch-prefix-doc))
;; Documentation for prefixed command