Merge tag 'debian/0.17-3'

[notmuch] / debian / notmuch.emacsen-startup

diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup
index 017938d5af095570c467fda20fab867775c43be9..60bf996820126f3377d68fbeeaf88cfbef32b79e 100644 (file)
--- a/debian/notmuch.emacsen-startup
+++ b/debian/notmuch.emacsen-startup
@@ -1,21 +1,28 @@
 ;; -*-emacs-lisp-*-
 ;;
 ;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50notmuch.el
-;; for the Debian #PACKAGE# package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
+;; for the Debian notmuch package
 
-;; The #PACKAGE# package follows the Debian/GNU Linux 'emacsen' policy and
+;; The notmuch package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
 ;; xemacs19, emacs20, xemacs20...).  The compiled code is then
 ;; installed in a subdirectory of the respective site-lisp directory.
-;; 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)
+
+  ))