From: Mark Walters Date: Fri, 8 Nov 2013 00:21:36 +0000 (+0000) Subject: [PATCH v2 5/5] emacs: tree: use remap for the over-ridden global bindings X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9dff4638204047fff16ab5dfddc3345af7fc180d;p=notmuch-archives.git [PATCH v2 5/5] emacs: tree: use remap for the over-ridden global bindings --- diff --git a/37/aab0146ffebfc008dae721f911492f1a687d1e b/37/aab0146ffebfc008dae721f911492f1a687d1e new file mode 100644 index 000000000..188e7c7c6 --- /dev/null +++ b/37/aab0146ffebfc008dae721f911492f1a687d1e @@ -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 B9159429E26 + for ; Thu, 7 Nov 2013 16:22:00 -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 danGwcCzDm17 for ; + Thu, 7 Nov 2013 16:21:55 -0800 (PST) +Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com + [74.125.82.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 550FF429E28 for ; Thu, 7 Nov 2013 16:21:50 -0800 + (PST) +Received: by mail-wg0-f48.google.com with SMTP id b13so1278008wgh.15 + for ; Thu, 07 Nov 2013 16:21:49 -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=yESbvmFQ28Xt7r5djaNqxSjeiOsc/byk7B/kTyWMEkaAawbdNFVCm1Y2Nps+jwFS7w + iXiS6MlE2omtwlri9uW5B9n2qebVmSX3l8LfKBuheD9Liqby/a1c8a6m+RfEcSEikh4B + BHcBp8PVigUU8BTqFbsMAYB/cByZkhrIxto7M2dA54S84dMIh7Qw/zum0wJbr/rYHDUO + eEneesiR8SGVN0e9SSkeVm+AohjgqT8s1OmYc7nbYw3Nzqpc5B56CCha1gyKxrKZjg8R + U7aAmi+XGkXW5jGuMwGHazSSUgKeNP/V6blhYB0WKrOzvdQLPOEol0XwafVLvCvFS+3m + ToLQ== +X-Received: by 10.180.38.34 with SMTP id d2mr73561wik.31.1383870109283; + Thu, 07 Nov 2013 16:21:49 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id pi6sm416852wic.3.2013.11.07.16.21.48 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Thu, 07 Nov 2013 16:21:48 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/5] emacs: tree: use remap for the over-ridden global + bindings +Date: Fri, 8 Nov 2013 00:21:36 +0000 +Message-Id: <1383870096-14627-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1383870096-14627-1-git-send-email-markwalters1009@gmail.com> +References: <1383870096-14627-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 00:22:01 -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 +