[PATCH] autoload notmuch-company if we have company

[Mark Walters]

---

Does this work for people with company installed (on top of the first
3 patches in the series)? I hope it should autoload notmuch-company if
the user has company. I don't on this computer (and am still running
emacs 23) so haven't tested.

Best wishes

Mark


emacs/notmuch-address.el | 5 +++++
 emacs/notmuch-company.el | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index d54a8bb..4a3fc23 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -22,6 +22,11 @@
 (require 'message)
 (require 'notmuch-parser)
 
+;; Only load notmuch-company if we have company (but we don't want an
+;; error if we don't have company
+(when (require 'company nil 't)
+  (require 'notmuch-company))
+
 ;;
 
 (defcustom notmuch-address-command nil
diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index f34aec4..9a44cf5 100644
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -33,7 +33,6 @@
 
 ;;; Code:
 
-(require 'company)
 (require 'message)
 (require 'notmuch-address)
 (require 'cl-lib)
-- 
2.1.4