[PATCH 2/3] emacs: add a stub entry to notmuch-pick in notmuch.el

diff --git a/71/a8fdb0fe9510c8f84a71728f42ba1d5a9b9291 b/71/a8fdb0fe9510c8f84a71728f42ba1d5a9b9291
new file mode 100644 (file)
index 0000000..99702a0
--- /dev/null
+++ b/71/a8fdb0fe9510c8f84a71728f42ba1d5a9b9291
@@ -0,0 +1,94 @@
+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 952B7421170\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:28 -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 VPQvi5YwiV84 for <notmuch@notmuchmail.org>;\r
+       Wed, 11 Jul 2012 11:57:27 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B3CBE429E57\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:24 -0700 (PDT)\r
+Received: by weyt57 with SMTP id t57so1096499wey.26\r
+       for <notmuch@notmuchmail.org>; Wed, 11 Jul 2012 11:57:23 -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:x-mailer:in-reply-to:references;\r
+       bh=XMwlRvviS6lRssRWeeqjX0c4BUOyCUflk0ciL2nMgnQ=;\r
+       b=D2ajN27rfPzGtaAuJ3RZS8ueFQPC7IxbHGtc++xA35mNps+PfnNrpqOJWMvAxHZJVw\r
+       DZXAbTopHdNrVdn/mWrNLZ+dvQQoQ5fnmTNV/xfyt+PZ15LO+mFrxBO8rjyY143cS8Z3\r
+       a5uNIoo+qwAwMUJGhMLpxQbVwkePQ2EzfUPFZRK/bLxgVH4WMMFdIbMLFhf2p0BFzqGZ\r
+       3ax+/9PWNxQ4eoJ0H83P4KYUm0EECW4x9yFI7N3yrb1JX1uuOk+atPMEDqBQ1bPkWa6/\r
+       ik318I7Qw02ydXNVPrBiFlA4QE79RdbmqJu9Z9zo4pL6DPu2HTxg1YN4B5rDTzkNxA3J\r
+       QsvA==\r
+Received: by 10.216.131.13 with SMTP id l13mr15926699wei.195.1342033043479;\r
+       Wed, 11 Jul 2012 11:57:23 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ l5sm6976439wix.5.2012.07.11.11.57.20  (version=TLSv1/SSLv3 cipher=OTHER);     Wed,\r
+ 11 Jul 2012 11:57:21 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] emacs: add a stub entry to notmuch-pick in notmuch.el\r
+Date: Wed, 11 Jul 2012 19:57:06 +0100\r
+Message-Id: <1342033027-30286-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1342033027-30286-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1342033027-30286-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: Wed, 11 Jul 2012 18:57:29 -0000\r
+\r
+This adds the stub entry to notmuch-pick.el to notmuch.el. We call\r
+notmuch-pick-init when notmuch starts up; by default this function\r
+does nothing but if the user replaces the file by the "proper" one\r
+from contrib then this will setup key binding for the various entries\r
+to notmuch-pick.\r
+---\r
+ emacs/notmuch.el |    2 ++\r
+ 1 files changed, 2 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index fabb7c0..2d32baa 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -58,6 +58,7 @@\r
+ (require 'notmuch-hello)\r
+ (require 'notmuch-maildir-fcc)\r
+ (require 'notmuch-message)\r
++(require 'notmuch-pick)\r
+ \r
+ (defcustom notmuch-search-result-format\r
+   `(("date" . "%12s ")\r
+@@ -1032,6 +1033,7 @@ current search results AND that are tagged with the given tag."\r
+ (defun notmuch ()\r
+   "Run notmuch and display saved searches, known tags, etc."\r
+   (interactive)\r
++  (notmuch-pick-init)\r
+   (notmuch-hello))\r
+ \r
+ (defun notmuch-interesting-buffer (b)\r
+-- \r
+1.7.9.1\r
+\r