TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

themes: use package-activate to support dependencies

This commit is contained in:
Benno Fünfstück 2017-04-25 17:23:48 +02:00 committed by Eivind Fonn
parent a2f1bfa8a4
commit abcad3bab0
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-themes-support.el
View File

@ -218,15 +218,14 @@ THEME."
;; Load theme
(unless (or (memq theme-name (custom-available-themes))
(eq 'default theme-name))
(let ((pkg-dir (spacemacs//get-theme-package-directory theme)))
(let ((pkg-dir (spacemacs//get-theme-package-directory theme))
(pkg-name (spacemacs/get-theme-package-name theme-name)))
(when pkg-dir
;; package activate should be enough, but not all themes
;; have add themselves to `custom-theme-load-path' in autoload.
;; (for example, moe-theme).
(add-to-list 'custom-theme-load-path pkg-dir)
(add-to-list 'load-path pkg-dir)
;; do we still need this particual case for moe theme?
(when (or (eq 'moe-light theme-name)
(eq 'moe-dark theme-name))
(load-file (concat pkg-dir "moe-light-theme.el"))
(load-file (concat pkg-dir "moe-dark-theme.el"))))))
(package-activate pkg-name))))
(when disable
(mapc 'disable-theme custom-enabled-themes))
(load-theme theme-name t)