[PATCH 2/2] contrib: pick: remove temporary keybinding

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