From cfad8d73734cfa25412947af49359d2ee64ed923 Mon Sep 17 00:00:00 2001
From: JSDurand <mmemmew@gmail.com>
Date: Fri, 24 Dec 2021 22:57:40 +0800
Subject: notmuch-conf: correctly load notmuch

---
 notmuch-conf.el | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'notmuch-conf.el')

diff --git a/notmuch-conf.el b/notmuch-conf.el
index cfbebfd..7892a19 100644
--- a/notmuch-conf.el
+++ b/notmuch-conf.el
@@ -26,8 +26,18 @@
 
 ;; The package is not installed in the usual package directory. Rather
 ;; it is included and installed by the notmuch distribution. So we
-;; only have to require it here.
+;; only have to load it here.
 
+(autoload 'durand-member "common")
+
+;; make sure the path is set up.
+(cond
+ ((not (durand-member "/usr/local/share/emacs/site-lisp/"
+                      load-path #'string=))
+  (setq load-path
+        (cons "/usr/local/share/emacs/site-lisp/" load-path))))
+
+(load "notmuch")
 (require 'notmuch)
 
 (setq notmuch-show-empty-saved-searches t)
-- 
cgit v1.2.3-18-g5258