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 arlo.cworth.org (Postfix) with ESMTP id 4027F6DE1226
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Oct 2015 08:53:50 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=-0.059 tagged_above=-999 required=5 tests=[AWL=0.511,
\r
12 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7,
\r
14 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001]
\r
16 Received: from arlo.cworth.org ([127.0.0.1])
\r
17 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
18 with ESMTP id 3DImRrCJ_t6o for <notmuch@notmuchmail.org>;
\r
19 Sat, 24 Oct 2015 08:53:48 -0700 (PDT)
\r
20 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com
\r
22 by arlo.cworth.org (Postfix) with ESMTPS id 130E36DE0C5F
\r
23 for <notmuch@notmuchmail.org>; Sat, 24 Oct 2015 08:53:48 -0700 (PDT)
\r
24 Received: by wikq8 with SMTP id q8so112359247wik.1
\r
25 for <notmuch@notmuchmail.org>; Sat, 24 Oct 2015 08:53:44 -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:in-reply-to:references;
\r
28 bh=g0NCoYnYHgSuntnQKB7AP5yiPNTmgAsJKJE9xfOITnc=;
\r
29 b=ZGgDxJALbGTqqtNysqmx0hPg//xQ5aJvwcUM232XTqsuT7EuUa0s9YL1JBwV1nxqC2
\r
30 H1+oviUas/4c/CaLe7paQBrb3t7mNSZ9kG/WmHM4wVU6XbVKyZIc/pZmjZyVXwvjji0l
\r
31 BK2WnNxUrquIRiVoPj+qPAawDZbMG9uLYx6l//Y812C+m3W/IutRyiTShs6zjZ4klJBG
\r
32 baxHeB6U59JY+CMC/M1lPtem+U3ua4oXfUm/zCgrn6NrA4jM7BkLQeGNoEZ1GXyOQkLC
\r
33 e+LtA5UGEFDo813bk0NE7jOqblA7tuV/+xeKlxKJzUvBgrzfJW5T5FTFbLQuBvXQZ8Q7
\r
35 X-Received: by 10.194.84.4 with SMTP id u4mr9530710wjy.149.1445702023931;
\r
36 Sat, 24 Oct 2015 08:53:43 -0700 (PDT)
\r
37 Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])
\r
38 by smtp.gmail.com with ESMTPSA id ki7sm28780830wjc.28.2015.10.24.08.53.42
\r
39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
40 Sat, 24 Oct 2015 08:53:43 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH] autoload notmuch-company if we have company
\r
44 Date: Sat, 24 Oct 2015 16:53:39 +0100
\r
45 Message-Id: <1445702019-10638-1-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 2.1.4
\r
47 In-Reply-To: <1445646037-25994-4-git-send-email-david@tethera.net>
\r
48 References: <1445646037-25994-4-git-send-email-david@tethera.net>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.20
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 24 Oct 2015 15:53:50 -0000
\r
65 Does this work for people with company installed (on top of the first
\r
66 3 patches in the series)? I hope it should autoload notmuch-company if
\r
67 the user has company. I don't on this computer (and am still running
\r
68 emacs 23) so haven't tested.
\r
75 emacs/notmuch-address.el | 5 +++++
\r
76 emacs/notmuch-company.el | 1 -
\r
77 2 files changed, 5 insertions(+), 1 deletion(-)
\r
79 diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
\r
80 index d54a8bb..4a3fc23 100644
\r
81 --- a/emacs/notmuch-address.el
\r
82 +++ b/emacs/notmuch-address.el
\r
85 (require 'notmuch-parser)
\r
87 +;; Only load notmuch-company if we have company (but we don't want an
\r
88 +;; error if we don't have company
\r
89 +(when (require 'company nil 't)
\r
90 + (require 'notmuch-company))
\r
94 (defcustom notmuch-address-command nil
\r
95 diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
\r
96 index f34aec4..9a44cf5 100644
\r
97 --- a/emacs/notmuch-company.el
\r
98 +++ b/emacs/notmuch-company.el
\r
103 -(require 'company)
\r
105 (require 'notmuch-address)
\r