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

core: remove support for all layers

This commit is contained in:
Eivind Fonn 2016-05-30 14:55:12 +02:00 committed by syl20bnr
parent 4ef24c27f7
commit d51987f497
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-configuration-layer.el
View File

@ -885,9 +885,6 @@ path."
(setq configuration-layer--layers nil)
(setq configuration-layer-paths (configuration-layer//discover-layers))
(unless configuration-layer-no-layer
(when (eq 'all dotspacemacs-configuration-layers)
(setq dotspacemacs-configuration-layers
(ht-keys configuration-layer-paths)))
(dolist (layer dotspacemacs-configuration-layers)
(let ((layer-name (if (listp layer) (car layer) layer)))
(unless (string-match-p "+distribution"

3
core/core-dotspacemacs.el
View File

@ -107,8 +107,7 @@ If the value is nil then no banner is displayed.")
when the current branch is not `develop'")
(defvar dotspacemacs-configuration-layers '(emacs-lisp)
"List of configuration layers to load. If it is the symbol `all' instead
of a list then all discovered layers will be installed.")
"List of configuration layers to load.")
(defvar dotspacemacs-themes '(spacemacs-dark
spacemacs-light

3
core/templates/.spacemacs.template
View File

@ -28,8 +28,7 @@ values."
;; List of additional paths where to look for configuration layers.
;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
dotspacemacs-configuration-layer-path '()
;; List of configuration layers to load. If it is the symbol `all' instead
;; of a list then all discovered layers will be installed.
;; List of configuration layers to load.
dotspacemacs-configuration-layers
'(
;; ----------------------------------------------------------------

22
tests/core/core-configuration-layer-ftest.el
View File

@ -26,17 +26,6 @@
(should (eq 'spacemacs-bootstrap
(oref (first configuration-layer--layers) :name)))))))
(ert-deftest test-declare-layers--bootstrap-layer-always-first-all ()
(let ((dotspacemacs-distribution 'spacemacs)
(dotspacemacs-configuration-layers 'all)
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((load (f) ((:output nil))))
(let (configuration-layer--layers)
(configuration-layer//declare-layers)
(should (eq 'spacemacs-bootstrap
(oref (first configuration-layer--layers) :name)))))))
(ert-deftest test-declare-layers--distribution-layer-is-second ()
(let ((dotspacemacs-distribution 'spacemacs-base)
(dotspacemacs-configuration-layers '(emacs-lisp
@ -45,14 +34,3 @@
(configuration-layer//declare-layers)
(should (eq 'spacemacs-base
(oref (second configuration-layer--layers) :name))))))
(ert-deftest test-declare-layers--distribution-layer-position-with-all-layers ()
(let ((dotspacemacs-distribution 'spacemacs-base)
(dotspacemacs-configuration-layers 'all)
(mocker-mock-default-record-cls 'mocker-stub-record))
(mocker-let
((load (f) ((:output nil))))
(let (configuration-layer--layers)
(configuration-layer//declare-layers)
(should (eq 'spacemacs-base
(oref (second configuration-layer--layers) :name)))))))