[PATCH v3 6/7] emacs: tree: use remap for the over-ridden global bindings

diff --git a/7a/398f7319e0b14b968ab072fda6f156f5fcd993 b/7a/398f7319e0b14b968ab072fda6f156f5fcd993
new file mode 100644 (file)
index 0000000..c7b8ec1
--- /dev/null
+++ b/7a/398f7319e0b14b968ab072fda6f156f5fcd993
@@ -0,0 +1,101 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4787E431FC9\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Nov 2013 09:40:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id CzDNDptqYLUa for <notmuch@notmuchmail.org>;\r
+       Fri,  8 Nov 2013 09:40:45 -0800 (PST)\r
+Received: from mail-we0-f180.google.com (mail-we0-f180.google.com\r
+       [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A3C00429E34\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Nov 2013 09:40:34 -0800 (PST)\r
+Received: by mail-we0-f180.google.com with SMTP id q59so2251443wes.25\r
+       for <notmuch@notmuchmail.org>; Fri, 08 Nov 2013 09:40:33 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=f4kWvHmYOseo5nf8oKQvCNywRigDgqsad7Dg87gy0Vo=;\r
+       b=qB+YZyyZwfny2Zh8txyPDWMkVCPk5q7eQH7rvji2FcAow1FJERa4QF7a/o/wbYwypz\r
+       eXpPjIMgBN4Vhih5eLDKI1SYyDnQoGOr/ndPnH0a43gxJnvpbFhqW7A9gTc23l4zr9EU\r
+       Dusp0tfuG9OzhL33uuD+/iFNAai4Lt5eX2/MMarX1chqQBCq7xLrsdy/CQlE9esT8Dhq\r
+       a65BgTtjrKdccvwRKfq1Hr60HmJcztUnIlkSHQgvIyiZD1SqzXext1Uw8D8F8T2XA/AE\r
+       xNxVwAXUHR52/7oTwdP0TFa+kKrrWKLOQ3ephHRFQgU+vv4SPYYlU0jbxGzwfGYpP2dw\r
+       F0Og==\r
+X-Received: by 10.195.13.164 with SMTP id ez4mr13213345wjd.11.1383932433521;\r
+       Fri, 08 Nov 2013 09:40:33 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id ey4sm7505445wic.11.2013.11.08.09.40.32\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 08 Nov 2013 09:40:33 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 6/7] emacs: tree: use remap for the over-ridden global\r
+       bindings\r
+Date: Fri,  8 Nov 2013 17:40:18 +0000\r
+Message-Id: <1383932419-12533-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 08 Nov 2013 17:40:52 -0000\r
+\r
+Following a suggestion by Austin in id:20130915153642.GY1426@mit.edu\r
+we use remap for the over-riding bindings in pick. This means that if\r
+the user modifies the global keymap these modifications will happen in\r
+the tree-view versions of them too.\r
+\r
+[tree-view overrides these to do things like close the message pane\r
+before doing the action, so the functionality is very close to the\r
+original common keymap function.]\r
+---\r
+ emacs/notmuch-tree.el |    8 ++++----\r
+ 1 files changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index f13b41f..8d59e65 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -220,13 +220,13 @@ FUNC."\r
+     (set-keymap-parent map notmuch-common-keymap)\r
+     ;; The following override the global keymap.\r
+     ;; Override because we want to close message pane first.\r
+-    (define-key map "?" (notmuch-tree-close-message-pane-and #'notmuch-help))\r
++    (define-key map [remap notmuch-help] (notmuch-tree-close-message-pane-and #'notmuch-help))\r
+     ;; Override because we first close message pane and then close tree buffer.\r
+-    (define-key map "q" 'notmuch-tree-quit)\r
++    (define-key map [remap notmuch-kill-this-buffer] 'notmuch-tree-quit)\r
+     ;; Override because we close message pane after the search query is entered.\r
+-    (define-key map "s" 'notmuch-tree-to-search)\r
++    (define-key map [remap notmuch-search] 'notmuch-tree-to-search)\r
+     ;; Override because we want to close message pane first.\r
+-    (define-key map "m" (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail))\r
++    (define-key map [remap notmuch-mua-new-mail] (notmuch-tree-close-message-pane-and #'notmuch-mua-new-mail))\r
+ \r
+     ;; these use notmuch-show functions directly\r
+     (define-key map "|" 'notmuch-show-pipe-message)\r
+-- \r
+1.7.9.1\r
+\r