From a5ecdf390e4dca6a314cee1594ab3236ea62ca85 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 12 Nov 2013 20:10:53 +0000 Subject: [PATCH] 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. --- emacs/notmuch-lib.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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