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

core: install bootstrap and pre packages first

Browse source 
Fix issues with built-in org being lodaed before org-plus-contrib.
This commit is contained in:
syl20bnr 2018-01-22 11:33:13 -05:00
parent 1580dfd094
commit 617d63095a
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/core-configuration-layer.el
View file

@ -1693,10 +1693,18 @@ RNAME is the name symbol of another existing layer."
(configuration-layer/retrieve-package-archives)
(setq installed-count 0)
(spacemacs//redisplay)
;; bootstrap and pre step packages first
(dolist (pkg-name upkg-names)
(setq installed-count (1+ installed-count))
(configuration-layer//install-package
(configuration-layer/get-package pkg-name)))
(let ((pkg (configuration-layer/get-package pkg-name)))
(when (and pkg (memq (oref pkg :step) '(bootstrap pre)))
(setq installed-count (1+ installed-count))
(configuration-layer//install-package pkg))))
;; then all other packages
(dolist (pkg-name upkg-names)
(let ((pkg (configuration-layer/get-package pkg-name)))
(unless (and pkg (memq (oref pkg :step) '(bootstrap pre)))
(setq installed-count (1+ installed-count))
(configuration-layer//install-package pkg))))
(spacemacs-buffer/append "\n")
(unless init-file-debug
;; get rid of all delayed warnings when byte-compiling packages