Fix non activated package if there is no defined init function
Fixes #898
This commit is contained in:
parent
8d66f55d05
commit
51c5de624d
|
@ -585,11 +585,14 @@ to select one."
|
||||||
"Initialize the package PKG from the configuration layers LAYERS."
|
"Initialize the package PKG from the configuration layers LAYERS."
|
||||||
(dolist (layer layers)
|
(dolist (layer layers)
|
||||||
(condition-case err
|
(condition-case err
|
||||||
(let* ((init-func (intern (format "%s/init-%s" layer pkg))))
|
(let* ((init-func (intern (format "%s/init-%s" layer pkg)))
|
||||||
(when (and (package-installed-p pkg) (fboundp init-func))
|
(msg (format "Package: Initializing %s:%s..." layer pkg)))
|
||||||
(spacemacs/message "Package: Initializing %s:%s..." layer pkg)
|
(when (package-installed-p pkg)
|
||||||
(configuration-layer//activate-package 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)))
|
(setq initializedp t)))
|
||||||
('error
|
('error
|
||||||
(configuration-layer//set-error)
|
(configuration-layer//set-error)
|
||||||
|
|
Loading…
Reference in a new issue