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 B9159429E26
\r
6 for <notmuch@notmuchmail.org>; Thu, 7 Nov 2013 16:22:00 -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 danGwcCzDm17 for <notmuch@notmuchmail.org>;
\r
18 Thu, 7 Nov 2013 16:21:55 -0800 (PST)
\r
19 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com
\r
20 [74.125.82.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 550FF429E28 for <notmuch@notmuchmail.org>; Thu, 7 Nov 2013 16:21:50 -0800
\r
24 Received: by mail-wg0-f48.google.com with SMTP id b13so1278008wgh.15
\r
25 for <notmuch@notmuchmail.org>; Thu, 07 Nov 2013 16:21:49 -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=yESbvmFQ28Xt7r5djaNqxSjeiOsc/byk7B/kTyWMEkaAawbdNFVCm1Y2Nps+jwFS7w
\r
30 iXiS6MlE2omtwlri9uW5B9n2qebVmSX3l8LfKBuheD9Liqby/a1c8a6m+RfEcSEikh4B
\r
31 BHcBp8PVigUU8BTqFbsMAYB/cByZkhrIxto7M2dA54S84dMIh7Qw/zum0wJbr/rYHDUO
\r
32 eEneesiR8SGVN0e9SSkeVm+AohjgqT8s1OmYc7nbYw3Nzqpc5B56CCha1gyKxrKZjg8R
\r
33 U7aAmi+XGkXW5jGuMwGHazSSUgKeNP/V6blhYB0WKrOzvdQLPOEol0XwafVLvCvFS+3m
\r
35 X-Received: by 10.180.38.34 with SMTP id d2mr73561wik.31.1383870109283;
\r
36 Thu, 07 Nov 2013 16:21:49 -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 pi6sm416852wic.3.2013.11.07.16.21.48
\r
39 for <multiple recipients>
\r
40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
41 Thu, 07 Nov 2013 16:21:48 -0800 (PST)
\r
42 From: Mark Walters <markwalters1009@gmail.com>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v2 5/5] emacs: tree: use remap for the over-ridden global
\r
46 Date: Fri, 8 Nov 2013 00:21:36 +0000
\r
47 Message-Id: <1383870096-14627-6-git-send-email-markwalters1009@gmail.com>
\r
48 X-Mailer: git-send-email 1.7.9.1
\r
49 In-Reply-To: <1383870096-14627-1-git-send-email-markwalters1009@gmail.com>
\r
50 References: <1383870096-14627-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 00:22:01 -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