[PATCH 1/5] emacs: compile and load notmuch-pick.el if present.

diff --git a/2f/8954d36d391c1925e71f2c28bd9230bc905392 b/2f/8954d36d391c1925e71f2c28bd9230bc905392
new file mode 100644 (file)
index 0000000..6b7cbdd
--- /dev/null
+++ b/2f/8954d36d391c1925e71f2c28bd9230bc905392
@@ -0,0 +1,112 @@
+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 B45D6431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:03 -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 XMu1l0Kp+4-3 for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 14:22:01 -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 1E310431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:00 -0700 (PDT)\r
+Received: by weyt57 with SMTP id t57so20631wey.26\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:21:59 -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=dUSBwykY4Xlbs1LiDF1J6TxOq0a+qgzyt3fkoEvrzlY=;\r
+       b=KDY8VBUzOFN1QDj7BTxz+0o+ILPhxUC1RtmzjuGdzvQtvqCT8nHWsxw6fFkQ+ItWFq\r
+       RZF1KdOKIaql8/dutoIKGQLfa92iw7GytxAQ1C8eyPufQMstmyZxsDI3I2f0i4DFn+V6\r
+       R6G3/DbQ4CJGd3cThvG47VsNdnJA6ph36rEM+9ygCXxLA1u2A1MrF5ylquytZ4AsqpQi\r
+       1rmS77i4s+mqFs0DK9087EAyP3immjH5lykISY2XVw5fX562s/qcMKYjFIvBh+QFxgdd\r
+       p2AOJvl+pTtRKrJG4qZspG3z9/bkuCF1d/uLInhv/GVlmD/lgaaKqpBFyATC5/Z0AcY9\r
+       bz5Q==\r
+Received: by 10.216.242.196 with SMTP id i46mr3363571wer.123.1343164919731;\r
+       Tue, 24 Jul 2012 14:21:59 -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
+ ef5sm9675874wib.3.2012.07.24.14.21.58 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 24 Jul 2012 14:21:58 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/5] emacs: compile and load notmuch-pick.el if present.\r
+Date: Tue, 24 Jul 2012 22:21:47 +0100\r
+Message-Id: <1343164911-31589-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1343164911-31589-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: Tue, 24 Jul 2012 21:22:04 -0000\r
+\r
+Compile and load notmuch-pick.el if present.\r
+\r
+All the actual setup of pick is done in the function notmuch-pick-init\r
+so we call that in the notmuch init function if it is bound. This\r
+function will setup all extra keybinding etc.\r
+---\r
+ emacs/Makefile.local |    3 ++-\r
+ emacs/notmuch.el     |    5 +++++\r
+ 2 files changed, 7 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/Makefile.local b/emacs/Makefile.local\r
+index fb82247..9f4dba6 100644\r
+--- a/emacs/Makefile.local\r
++++ b/emacs/Makefile.local\r
+@@ -15,7 +15,8 @@ emacs_sources := \\r
+       $(dir)/notmuch-crypto.el \\r
+       $(dir)/notmuch-tag.el \\r
+       $(dir)/coolj.el \\r
+-      $(dir)/notmuch-print.el\r
++      $(dir)/notmuch-print.el \\r
++      $(wildcard $(dir)/notmuch-pick.el)\r
+ \r
+ emacs_images := \\r
+       $(srcdir)/$(dir)/notmuch-logo.png\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index fd1836f..4f3da4f 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -59,6 +59,9 @@\r
+ (require 'notmuch-maildir-fcc)\r
+ (require 'notmuch-message)\r
+ \r
++;; Load notmuch-pick if available (but do not error if not present).\r
++(load "notmuch-pick" t)\r
++\r
+ (defcustom notmuch-search-result-format\r
+   `(("date" . "%12s ")\r
+     ("count" . "%-7s ")\r
+@@ -1088,6 +1091,8 @@ 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
++  (when (fboundp 'notmuch-pick-init)\r
++    (notmuch-pick-init))\r
+   (notmuch-hello))\r
+ \r
+ (defun notmuch-interesting-buffer (b)\r
+-- \r
+1.7.9.1\r
+\r