-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
- (symbol-name flavor)
- "/site-lisp/notmuch")))
-;; If package-dir does not exist, the notmuch package must have
-;; removed but not purged, and we should skip the setup.
- (when (file-directory-p package-dir)
- (setq load-path (cons package-dir load-path))
+
+(cond
+ ((not (file-exists-p "/usr/share/emacs/site-lisp/notmuch"))
+ (message "Package notmuch removed but not purged. Skipping setup."))
+ ((not (file-exists-p (concat "/usr/share/"
+ (symbol-name debian-emacs-flavor)
+ "/site-lisp/notmuch")))
+ (message "Package notmuch not fully installed. Skipping setup."))
+ (t
+ (debian-pkg-add-load-path-item
+ (concat "/usr/share/"
+ (symbol-name debian-emacs-flavor)
+ "/site-lisp/notmuch"))
+ (autoload 'notmuch "notmuch" "Run notmuch and display saved searches, known tags, etc." t)
+ (autoload 'notmuch-hello "notmuch" "Run notmuch and display saved searches, known tags, etc." t)
+ (autoload 'notmuch-search "notmuch" "Run \"notmuch search\" with the given query string and display results." t)
+ (autoload 'notmuch-show "notmuch" "Run \"notmuch show\" with the given thread ID and display results." t)
+
+ ))