[SCM] ecasound/master: Check if the elisp package dir exists in the startup script

ghedo at users.alioth.debian.org ghedo at users.alioth.debian.org
Tue May 22 20:22:24 UTC 2012


The following commit has been merged in the master branch:
commit 5a53da452688e0994ef616a132481710f400be2f
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed May 16 19:43:46 2012 +0200

    Check if the elisp package dir exists in the startup script

diff --git a/debian/ecasound-el.emacsen-startup b/debian/ecasound-el.emacsen-startup
index 2d7acd7..f242918 100644
--- a/debian/ecasound-el.emacsen-startup
+++ b/debian/ecasound-el.emacsen-startup
@@ -2,12 +2,19 @@
 ;;
 ;; Emacs startup file for the Debian ecasound-el package
 
-(debian-pkg-add-load-path-item
- (concat "/usr/share/"
-         (symbol-name debian-emacs-flavor)
-         "/site-lisp/ecasound-el"))
+(let ((package-dir (concat "/usr/share/"
+                           (symbol-name debian-emacs-flavor)
+                           "/site-lisp/ecasound-el")))
 
-(autoload 'ecasound "ecasound" "Run an inferior ecasound, with I/O through BUFFER." t)
-(autoload 'ecasound-ewf-mode "ecasound" "A major mode for editing ecasound .ewf files." t)
+ ;; If package-dir does not exist, ecasound-el must have been removed but not
+ ;; purged, and its setup should be skipped.
+ (when (file-directory-p package-dir)
+  (debian-pkg-add-load-path-item package-dir)
 
-(add-to-list 'auto-mode-alist '("\\.ewf\\'" . ecasound-ewf-mode))
+  (autoload 'ecasound "ecasound"
+    "Run an inferior ecasound, with I/O through BUFFER." t)
+
+  (autoload 'ecasound-ewf-mode "ecasound"
+    "A major mode for editing ecasound .ewf files." t)
+
+  (add-to-list 'auto-mode-alist '("\\.ewf\\'" . ecasound-ewf-mode))))

-- 
ecasound packaging



More information about the pkg-multimedia-commits mailing list