1 Return-Path: <markwalters1009@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id B45D6431FAE
\r
6 for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:03 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id XMu1l0Kp+4-3 for <notmuch@notmuchmail.org>;
\r
18 Tue, 24 Jul 2012 14:22:01 -0700 (PDT)
\r
19 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com
\r
20 [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 1E310431FAF
\r
23 for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:22:00 -0700 (PDT)
\r
24 Received: by weyt57 with SMTP id t57so20631wey.26
\r
25 for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 14:21:59 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
28 bh=dUSBwykY4Xlbs1LiDF1J6TxOq0a+qgzyt3fkoEvrzlY=;
\r
29 b=KDY8VBUzOFN1QDj7BTxz+0o+ILPhxUC1RtmzjuGdzvQtvqCT8nHWsxw6fFkQ+ItWFq
\r
30 RZF1KdOKIaql8/dutoIKGQLfa92iw7GytxAQ1C8eyPufQMstmyZxsDI3I2f0i4DFn+V6
\r
31 R6G3/DbQ4CJGd3cThvG47VsNdnJA6ph36rEM+9ygCXxLA1u2A1MrF5ylquytZ4AsqpQi
\r
32 1rmS77i4s+mqFs0DK9087EAyP3immjH5lykISY2XVw5fX562s/qcMKYjFIvBh+QFxgdd
\r
33 p2AOJvl+pTtRKrJG4qZspG3z9/bkuCF1d/uLInhv/GVlmD/lgaaKqpBFyATC5/Z0AcY9
\r
35 Received: by 10.216.242.196 with SMTP id i46mr3363571wer.123.1343164919731;
\r
36 Tue, 24 Jul 2012 14:21:59 -0700 (PDT)
\r
37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
\r
38 [94.192.233.223]) by mx.google.com with ESMTPS id
\r
39 ef5sm9675874wib.3.2012.07.24.14.21.58 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Tue, 24 Jul 2012 14:21:58 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 1/5] emacs: compile and load notmuch-pick.el if present.
\r
44 Date: Tue, 24 Jul 2012 22:21:47 +0100
\r
45 Message-Id: <1343164911-31589-2-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 In-Reply-To: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com>
\r
48 References: <1343164911-31589-1-git-send-email-markwalters1009@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Tue, 24 Jul 2012 21:22:04 -0000
\r
63 Compile and load notmuch-pick.el if present.
\r
65 All the actual setup of pick is done in the function notmuch-pick-init
\r
66 so we call that in the notmuch init function if it is bound. This
\r
67 function will setup all extra keybinding etc.
\r
69 emacs/Makefile.local | 3 ++-
\r
70 emacs/notmuch.el | 5 +++++
\r
71 2 files changed, 7 insertions(+), 1 deletions(-)
\r
73 diff --git a/emacs/Makefile.local b/emacs/Makefile.local
\r
74 index fb82247..9f4dba6 100644
\r
75 --- a/emacs/Makefile.local
\r
76 +++ b/emacs/Makefile.local
\r
77 @@ -15,7 +15,8 @@ emacs_sources := \
\r
78 $(dir)/notmuch-crypto.el \
\r
79 $(dir)/notmuch-tag.el \
\r
81 - $(dir)/notmuch-print.el
\r
82 + $(dir)/notmuch-print.el \
\r
83 + $(wildcard $(dir)/notmuch-pick.el)
\r
86 $(srcdir)/$(dir)/notmuch-logo.png
\r
87 diff --git a/emacs/notmuch.el b/emacs/notmuch.el
\r
88 index fd1836f..4f3da4f 100644
\r
89 --- a/emacs/notmuch.el
\r
90 +++ b/emacs/notmuch.el
\r
92 (require 'notmuch-maildir-fcc)
\r
93 (require 'notmuch-message)
\r
95 +;; Load notmuch-pick if available (but do not error if not present).
\r
96 +(load "notmuch-pick" t)
\r
98 (defcustom notmuch-search-result-format
\r
99 `(("date" . "%12s ")
\r
100 ("count" . "%-7s ")
\r
101 @@ -1088,6 +1091,8 @@ current search results AND that are tagged with the given tag."
\r
103 "Run notmuch and display saved searches, known tags, etc."
\r
105 + (when (fboundp 'notmuch-pick-init)
\r
106 + (notmuch-pick-init))
\r
109 (defun notmuch-interesting-buffer (b)
\r