-;; 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))
+
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/notmuch"))
+ (message "Package notmuch removed but not purged. Skipping setup.")
+ (debian-pkg-add-load-path-item
+ (concat
+ "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/notmuch"))