This is version 2 of the series id:1382821479-23384-1-git-send-email-markwalters1009@gmail.com It fixes most of the comments Austin raised in his review. The first patch is now trivial and fixes a bug with unset keys in help. (This is Austin's solution which is obviously better than mine was) The second patch is unchanged. The third patch is new and just separates out a helper function. This will make the remapping help code clearer, but is probably good in its own right. The fourth patch deals with help for the remapping case. It is completely separate from the main help so does not clutter it up like it did before. The logic is slightly different from before: it now puts all remapped bindings in rather than just the first (if the command being remapped was bound to multiple keys). The fifth patch adds remappings to tree and is unchanged. It does not address Austin's query about passing down the base keymap for the remapping. Best wishes Mark Mark Walters (5): emacs: help: check for nil key binding emacs: help: remove duplicate bindings emacs: help: split out notmuch-describe-key as a function emacs: help: add a special function to deal with remaps emacs: tree: use remap for the over-ridden global bindings emacs/notmuch-lib.el | 76 +++++++++++++++++++++++++++++++++++------------- emacs/notmuch-tree.el | 8 ++-- 2 files changed, 59 insertions(+), 25 deletions(-) -- 1.7.9.1