diff options
| author | Yang Sheng <yangsheng6810@gmail.com> | 2019-03-02 23:35:33 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-03-31 12:00:50 -0300 |
| commit | 0ae8cab4d38ee146876fda48d86f662e397bfb51 (patch) | |
| tree | 1e3541b60c89f2a2c0bbba9a8ba336d29f26dfcd | |
| parent | b22386f353fb30a0d6ccffb32b7339d69f12b85f (diff) | |
Fix notmuch-describe-key
Fix notmuch-describe-key crashing for the following two cases
1. format-kbd-macro cannot deal with keys like [(32 . 126)], switch to
use key-description instead.
2. if a function in the current keymap is not bounded, it will crash
the whole process. We check if it is bounded and silently skip it to
avoid crashing.
| -rw-r--r-- | emacs/notmuch-lib.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 8cf7261e..546ab6fd 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -298,7 +298,7 @@ This is basically just `format-kbd-macro' but we also convert ESC to M-." "Prepend cons cells describing prefix-arg ACTUAL-KEY and ACTUAL-KEY to TAIL It does not prepend if ACTUAL-KEY is already listed in TAIL." - (let ((key-string (concat prefix (format-kbd-macro actual-key)))) + (let ((key-string (concat prefix (key-description actual-key)))) ;; We don't include documentation if the key-binding is ;; over-ridden. Note, over-riding a binding automatically hides the ;; prefixed version too. @@ -313,7 +313,7 @@ It does not prepend if ACTUAL-KEY is already listed in TAIL." ;; Documentation for command (push (cons key-string (or (and (symbolp binding) (get binding 'notmuch-doc)) - (notmuch-documentation-first-line binding))) + (and (functionp binding) (notmuch-documentation-first-line binding)))) tail))) tail) |