From: Mark Walters Date: Fri, 8 Nov 2013 17:40:18 +0000 (+0000) Subject: [PATCH v3 6/7] emacs: tree: use remap for the over-ridden global bindings X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a680db8e20a4b13e057775ca3c3c3dc19e3b63c3;p=notmuch-archives.git [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 index 000000000..c7b8ec103 --- /dev/null +++ b/7a/398f7319e0b14b968ab072fda6f156f5fcd993 @@ -0,0 +1,101 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 4787E431FC9 + for ; Fri, 8 Nov 2013 09:40:52 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id CzDNDptqYLUa for ; + Fri, 8 Nov 2013 09:40:45 -0800 (PST) +Received: from mail-we0-f180.google.com (mail-we0-f180.google.com + [74.125.82.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A3C00429E34 + for ; Fri, 8 Nov 2013 09:40:34 -0800 (PST) +Received: by mail-we0-f180.google.com with SMTP id q59so2251443wes.25 + for ; Fri, 08 Nov 2013 09:40:33 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=f4kWvHmYOseo5nf8oKQvCNywRigDgqsad7Dg87gy0Vo=; + b=qB+YZyyZwfny2Zh8txyPDWMkVCPk5q7eQH7rvji2FcAow1FJERa4QF7a/o/wbYwypz + eXpPjIMgBN4Vhih5eLDKI1SYyDnQoGOr/ndPnH0a43gxJnvpbFhqW7A9gTc23l4zr9EU + Dusp0tfuG9OzhL33uuD+/iFNAai4Lt5eX2/MMarX1chqQBCq7xLrsdy/CQlE9esT8Dhq + a65BgTtjrKdccvwRKfq1Hr60HmJcztUnIlkSHQgvIyiZD1SqzXext1Uw8D8F8T2XA/AE + xNxVwAXUHR52/7oTwdP0TFa+kKrrWKLOQ3ephHRFQgU+vv4SPYYlU0jbxGzwfGYpP2dw + F0Og== +X-Received: by 10.195.13.164 with SMTP id ez4mr13213345wjd.11.1383932433521; + Fri, 08 Nov 2013 09:40:33 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id ey4sm7505445wic.11.2013.11.08.09.40.32 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Fri, 08 Nov 2013 09:40:33 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 6/7] emacs: tree: use remap for the over-ridden global + bindings +Date: Fri, 8 Nov 2013 17:40:18 +0000 +Message-Id: <1383932419-12533-7-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com> +References: <1383932419-12533-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 08 Nov 2013 17:40:52 -0000 + +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 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +index f13b41f..8d59e65 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) +-- +1.7.9.1 +