Fix non activated package if there is no defined init function

Fixes #898
This commit is contained in:
syl20bnr 2015-03-22 03:02:15 -04:00
parent 8d66f55d05
commit 51c5de624d

View file

@ -585,11 +585,14 @@ to select one."
"Initialize the package PKG from the configuration layers LAYERS."
(dolist (layer layers)
(condition-case err
(let* ((init-func (intern (format "%s/init-%s" layer pkg))))
(when (and (package-installed-p pkg) (fboundp init-func))
(spacemacs/message "Package: Initializing %s:%s..." layer pkg)
(let* ((init-func (intern (format "%s/init-%s" layer pkg)))
(msg (format "Package: Initializing %s:%s..." layer pkg)))
(when (package-installed-p pkg)
(configuration-layer//activate-package pkg)
(funcall init-func)
(if (not (fboundp init-func))
(spacemacs/message (concat msg " (no init function)"))
(spacemacs/message msg)
(funcall init-func))
(setq initializedp t)))
('error
(configuration-layer//set-error)