From 9838fe8e163eae2ae4c3eb8059661004737fbc92 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 12 Nov 2013 20:10:59 +0000 Subject: emacs: tree: use remap for the over-ridden global bindings Following a suggestion by Austin in id:20130915153642.GY1426@mit.edu we use remap for the over-riding bindings in pick. This means that if the user modifies the global keymap these modifications will happen in the tree-view versions of them too. [tree-view overrides these to do things like close the message pane before doing the action, so the functionality is very close to the original common keymap function.] --- emacs/notmuch-tree.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'emacs') diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index f13b41f5..8d59e65f 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -220,13 +220,13 @@ FUNC." (set-keymap-parent map notmuch-common-keymap) ;; The following override the global keymap. ;; Override because we want to close message pane first. - (define-key map "?" (notmuch-tree-close-message-pane-and #'notmuch-help)) + (define-key map [remap notmuch-help] (notmuch-tree-close-message-pane-and #'notmuch-help)) ;; Override because we first close message pane and then close tree buffer. - (define-key map "q" 'notmuch-tree-quit) + (define-key map [remap notmuch-kill-this-buffer] 'notmuch-tree-quit) ;; Override because we close message pane after the search query is entered. - (define-key map "s" 'notmuch-tree-to-search) + (define-key map [remap notmuch-search] 'notmuch-tree-to-search) ;; Override because we want to close message pane first. - (define-key map "m" (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail)) + (define-key map [remap notmuch-mua-new-mail] (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail)) ;; these use notmuch-show functions directly (define-key map "|" 'notmuch-show-pipe-message) -- cgit v1.2.3