From ac007835386007e4e0eb5f956cd01270104c0c37 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Mon, 23 Sep 2013 20:52:59 +0100 Subject: [PATCH] [PATCH 2/2] contrib: pick: remove temporary keybinding --- 82/301994e35d2aaafdc22fc34b389fde750b2807 | 87 +++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 82/301994e35d2aaafdc22fc34b389fde750b2807 diff --git a/82/301994e35d2aaafdc22fc34b389fde750b2807 b/82/301994e35d2aaafdc22fc34b389fde750b2807 new file mode 100644 index 000000000..3581ebd85 --- /dev/null +++ b/82/301994e35d2aaafdc22fc34b389fde750b2807 @@ -0,0 +1,87 @@ +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 3A3E5431FBD + for ; Mon, 23 Sep 2013 12:53:22 -0700 (PDT) +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 HXSST3Stc1sy for ; + Mon, 23 Sep 2013 12:53:14 -0700 (PDT) +Received: from mail-we0-f173.google.com (mail-we0-f173.google.com + [74.125.82.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 9C1B3431FBF + for ; Mon, 23 Sep 2013 12:53:08 -0700 (PDT) +Received: by mail-we0-f173.google.com with SMTP id w62so3508570wes.18 + for ; Mon, 23 Sep 2013 12:53:07 -0700 (PDT) +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=xA1HRicLU6/EvV3VHLhDppYBefqsZXRdLM3G07kEvD4=; + b=Jpsm8WQQW5TEvzUhOc5mjIlEN85fkymZyRB3cEmSSd55vAJ/nLJUg/vIu1qZn15FkU + ppv/exzJ3QOSAzw8G/m3d0Rl8ZwmDMb+Iv7n4jJfC12Tma3pViX6jrD33IRW/tfXy4ef + WXbSbqt3iPLGuO5dVzQrgflTX0js5Q12Sx7WlHIjPM34p7v6wrTybpN/iQmZT8I2K6fH + vQ5v3dBlUiI6dCmDsgKlEfGDeYXEW6R4LFQtS+BbAXUWXyHhN3EPSs4r+MaeNJO0Vf8Q + stZ3asiNBdgCaATtQa4XF8CMZdB8qIAoZ9i6DElfjUUM59c3uWwKle6fDqEOL3jVFlOQ + Fvhw== +X-Received: by 10.180.80.36 with SMTP id o4mr2483841wix.47.1379965987534; + Mon, 23 Sep 2013 12:53:07 -0700 (PDT) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id d11sm726205wic.4.1969.12.31.16.00.00 + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Mon, 23 Sep 2013 12:53:07 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] contrib: pick: remove temporary keybinding +Date: Mon, 23 Sep 2013 20:52:59 +0100 +Message-Id: <1379965979-14752-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1379965979-14752-1-git-send-email-markwalters1009@gmail.com> +References: <1379965979-14752-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: Mon, 23 Sep 2013 19:53:22 -0000 + +We would like to bind prefix-arg RET in search view to "pick show this +thread" (i.e. notmuch-pick-from-search-thread). It is not easy to do +this cleanly from contrib so I have been using M-RET instead. + +Temporarily remove this functionality in preparation for entering +mainline and binding to prefix-arg RET. +--- + contrib/notmuch-pick/notmuch-pick.el | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 3afdea4..0aa651e 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -940,7 +940,6 @@ The arguments are: + ;; Set up key bindings from the rest of notmuch. + (define-key notmuch-common-keymap "z" 'notmuch-pick) + (define-key notmuch-search-mode-map "Z" 'notmuch-pick-from-search-current-query) +-(define-key notmuch-search-mode-map (kbd "M-RET") 'notmuch-pick-from-search-thread) + (define-key notmuch-show-mode-map "Z" 'notmuch-pick-from-show-current-query) + (message "Initialised notmuch-pick") + +-- +1.7.9.1 + -- 2.26.2