This series makes 3 tweaks to the emacs help. The first fixes a bug whereby if a user unsets a keybinding notmuch-help throws an error (function being nil) and does not work. The second removes duplicates from the list of returned keybindings; these occur if a user or mode overrides a keybinding in notmuch-common-keymap. This happens in pick. See id:1381498794-17000-1-git-send-email-markwalters1009@gmail.com for a different approach. I think this is probably neater but am happy either way. The third patch fixes some problems if a user or mode rebinds keys using remap. Currently they appear in help as "<remap><function> New function docstring". This patch replaces the <remap><function> with the actual key binding. The final patch is separate but is the actual motivation for the earlier ones. It switches pick to use remap for its over bindings. This means the over bindings will work correctly if the user customises the common-keymap. This approach was suggested by Austin in id:20130915153642.GY1426@mit.edu. All tests pass and it seems to work including modifications to the common-keymap. Best wishes Mark PS Obviously the final patch will clash with a rename of pick to tree, but the rebase will be trivial. Mark Walters (4): emacs: help: check for nil key binding emacs: help: remove duplicate bindings emacs: help: remap support contrib: pick: use remap for the over-ridden global bindings contrib/notmuch-pick/notmuch-pick.el | 8 ++-- emacs/notmuch.el | 58 +++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 26 deletions(-) -- 1.7.9.1