1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 4787E431FC9
\r
6 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:52 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id CzDNDptqYLUa for <notmuch@notmuchmail.org>;
\r
18 Fri, 8 Nov 2013 09:40:45 -0800 (PST)
\r
19 Received: from mail-we0-f180.google.com (mail-we0-f180.google.com
\r
20 [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id A3C00429E34
\r
23 for <notmuch@notmuchmail.org>; Fri, 8 Nov 2013 09:40:34 -0800 (PST)
\r
24 Received: by mail-we0-f180.google.com with SMTP id q59so2251443wes.25
\r
25 for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:33 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:in-reply-to:references;
\r
28 bh=f4kWvHmYOseo5nf8oKQvCNywRigDgqsad7Dg87gy0Vo=;
\r
29 b=qB+YZyyZwfny2Zh8txyPDWMkVCPk5q7eQH7rvji2FcAow1FJERa4QF7a/o/wbYwypz
\r
30 eXpPjIMgBN4Vhih5eLDKI1SYyDnQoGOr/ndPnH0a43gxJnvpbFhqW7A9gTc23l4zr9EU
\r
31 Dusp0tfuG9OzhL33uuD+/iFNAai4Lt5eX2/MMarX1chqQBCq7xLrsdy/CQlE9esT8Dhq
\r
32 a65BgTtjrKdccvwRKfq1Hr60HmJcztUnIlkSHQgvIyiZD1SqzXext1Uw8D8F8T2XA/AE
\r
33 xNxVwAXUHR52/7oTwdP0TFa+kKrrWKLOQ3ephHRFQgU+vv4SPYYlU0jbxGzwfGYpP2dw
\r
35 X-Received: by 10.195.13.164 with SMTP id ez4mr13213345wjd.11.1383932433521;
\r
36 Fri, 08 Nov 2013 09:40:33 -0800 (PST)
\r
37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
\r
38 by mx.google.com with ESMTPSA id ey4sm7505445wic.11.2013.11.08.09.40.32
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Fri, 08 Nov 2013 09:40:33 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v3 6/7] emacs: tree: use remap for the over-ridden global
\r
46 Date: Fri, 8 Nov 2013 17:40:18 +0000
\r
47 Message-Id: <1383932419-12533-7-git-send-email-markwalters1009@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.9.1
\r
49 In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
50 References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>
\r
51 X-BeenThere: notmuch@notmuchmail.org
\r
52 X-Mailman-Version: 2.1.13
\r
54 List-Id: "Use and development of the notmuch mail system."
\r
55 <notmuch.notmuchmail.org>
\r
56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
59 List-Post: <mailto:notmuch@notmuchmail.org>
\r
60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
63 X-List-Received-Date: Fri, 08 Nov 2013 17:40:52 -0000
\r
65 Following a suggestion by Austin in id:20130915153642.GY1426@mit.edu
\r
66 we use remap for the over-riding bindings in pick. This means that if
\r
67 the user modifies the global keymap these modifications will happen in
\r
68 the tree-view versions of them too.
\r
70 [tree-view overrides these to do things like close the message pane
\r
71 before doing the action, so the functionality is very close to the
\r
72 original common keymap function.]
\r
74 emacs/notmuch-tree.el | 8 ++++----
\r
75 1 files changed, 4 insertions(+), 4 deletions(-)
\r
77 diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
\r
78 index f13b41f..8d59e65 100644
\r
79 --- a/emacs/notmuch-tree.el
\r
80 +++ b/emacs/notmuch-tree.el
\r
81 @@ -220,13 +220,13 @@ FUNC."
\r
82 (set-keymap-parent map notmuch-common-keymap)
\r
83 ;; The following override the global keymap.
\r
84 ;; Override because we want to close message pane first.
\r
85 - (define-key map "?" (notmuch-tree-close-message-pane-and #'notmuch-help))
\r
86 + (define-key map [remap notmuch-help] (notmuch-tree-close-message-pane-and #'notmuch-help))
\r
87 ;; Override because we first close message pane and then close tree buffer.
\r
88 - (define-key map "q" 'notmuch-tree-quit)
\r
89 + (define-key map [remap notmuch-kill-this-buffer] 'notmuch-tree-quit)
\r
90 ;; Override because we close message pane after the search query is entered.
\r
91 - (define-key map "s" 'notmuch-tree-to-search)
\r
92 + (define-key map [remap notmuch-search] 'notmuch-tree-to-search)
\r
93 ;; Override because we want to close message pane first.
\r
94 - (define-key map "m" (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail))
\r
95 + (define-key map [remap notmuch-mua-new-mail] (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail))
\r
97 ;; these use notmuch-show functions directly
\r
98 (define-key map "|" 'notmuch-show-pipe-message)
\r