[PATCH 2/2] Add org-notmuch.el to Makefile and to org-modules.

[David Bremner <bremner@unb.ca>]

---
 Makefile    |    1 +
 lisp/org.el |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 18b37d3..177139f 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ LISPF      = 	org.el			\
 		org-mhe.el		\
 		org-mobile.el		\
 		org-mouse.el		\
+		org-notmuch.el		\
 		org-publish.el		\
 		org-plot.el		\
 		org-protocol.el		\
diff --git a/lisp/org.el b/lisp/org.el
index 48ec349..a27b431 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -170,7 +170,7 @@ With prefix arg HERE, insert it at point."
   (let ((a (member 'org-infojs org-modules)))
     (and a (setcar a 'org-jsinfo))))
 
-(defcustom org-modules '(org-bbdb org-bibtex org-docview org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-w3m org-wl)
+(defcustom org-modules '(org-bbdb org-bibtex org-docview org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-w3m org-wl org-notmuch)
   "Modules that should always be loaded together with org.el.
 If a description starts with <C>, the file is not part of Emacs
 and loading it will require that you have downloaded and properly installed
@@ -201,6 +201,7 @@ to add the symbol `xyz', and the package must have a call to
 	(const :tag "   mac-message:       Links to messages in Apple Mail" org-mac-message)
 	(const :tag "   mew                Links to Mew folders/messages" org-mew)
 	(const :tag "   mhe:               Links to MHE folders/messages" org-mhe)
+	(const :tag "   notmuch:           Links to Notmuch threads/messages" org-notmuch)
 	(const :tag "   protocol:          Intercept calls from emacsclient" org-protocol)
 	(const :tag "   rmail:             Links to RMAIL folders/messages" org-rmail)
 	(const :tag "   vm:                Links to VM folders/messages" org-vm)
-- 
1.7.0