[PATCH 2/3] contrib: pick: use the new notmuch-common-keymap for pick entry

diff --git a/33/89a9814649b6adfd144a5d879ce7da22b7a1fa b/33/89a9814649b6adfd144a5d879ce7da22b7a1fa
new file mode 100644 (file)
index 0000000..96b845f
--- /dev/null
+++ b/33/89a9814649b6adfd144a5d879ce7da22b7a1fa
@@ -0,0 +1,90 @@
+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 C6478431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:23 -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 XN0-LWi5Igo5 for <notmuch@notmuchmail.org>;\r
+       Sun, 15 Sep 2013 07:35:18 -0700 (PDT)\r
+Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com\r
+ [74.125.82.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ AF8DD431FBD   for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:15 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f53.google.com with SMTP id x12so2784383wgg.20\r
+       for <notmuch@notmuchmail.org>; Sun, 15 Sep 2013 07:35:14 -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=3QHcwDOBWhJS3LxzIvtNr7qXH9RGoLm+0tPUPGOPTFI=;\r
+       b=zPejJzJ5Wk88z+0lqj8Kgrw/3qzuKI2odnV675wqeK1qhXoGmOIZqTeEzhwT0b1Hp4\r
+       qpsbejnZ8wFjK3sfsgfj0UEmuArRKfnQ/mHMG1z9qHRy9bF1e7CDs3ozp5eYxPWeEL2l\r
+       AuIJdr82Q6BVRHJeMTqoFoOYdE30glU6r4LaZf73FtaL9N4Qnc6t2/dHKFmjwdNvKefi\r
+       1Ik27ENz91YOPNFJf1Nr8L8CIuAF26zK/IquUCCb+dFAgkVyQCXyUOZg4hw6zm15xDhs\r
+       aNgdWDmBnAcU4mGw3vA8Qyq/2erONeMKfC1wEZZkO8DsIFUrN/kYzAtk069DP2Qh/Z8b\r
+       NpGQ==\r
+X-Received: by 10.194.250.6 with SMTP id yy6mr18638881wjc.13.1379255714641;\r
+       Sun, 15 Sep 2013 07:35:14 -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\r
+       ey4sm16891988wic.11.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 15 Sep 2013 07:35:14 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] contrib: pick: use the new notmuch-common-keymap for pick\r
+       entry\r
+Date: Sun, 15 Sep 2013 15:35:05 +0100\r
+Message-Id: <1379255706-2418-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1379255706-2418-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1379255706-2418-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: Sun, 15 Sep 2013 14:35:24 -0000\r
+\r
+Austin recently added a global keymap: use this for pick\r
+entry.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |    4 +---\r
+ 1 files changed, 1 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 2deee42..386fef5 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -966,11 +966,9 @@ The arguments are:\r
+ \r
+ \r
+ ;; Set up key bindings from the rest of notmuch.\r
+-(define-key notmuch-search-mode-map "z" 'notmuch-pick)\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-hello-mode-map "z" 'notmuch-pick-from-hello)\r
+-(define-key notmuch-show-mode-map "z" 'notmuch-pick)\r
+ (define-key notmuch-show-mode-map "Z" 'notmuch-pick-from-show-current-query)\r
+ (notmuch-pick-setup-show-out)\r
+ (message "Initialised notmuch-pick")\r
+-- \r
+1.7.9.1\r
+\r