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

core: actually read :disabled-for layer property 

Also it is not need to pass a list, example:

```
(setq dotspacemacs-configuration-layers
   '((auto-completion :disabled-for org git)))
```

Will disable auto-completion for org and git layers.
This commit is contained in:
syl20bnr 2015-09-03 13:17:02 -04:00
parent 88d30d7074
commit 8adc82d1ae
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,8 @@ layer directory."
(let* ((name-sym (if (listp layer) (car layer) layer))
(name-str (symbol-name name-sym))
(base-dir (configuration-layer/get-layer-path name-sym))
(disabled (when (listp layer)
(spacemacs/mplist-get layer :disabled-for)))
(variables (when (listp layer)
(spacemacs/mplist-get layer :variables))))
(if base-dir
@ -203,6 +205,7 @@ layer directory."
(cfgl-layer name-str
:name name-sym
:dir dir
:disabled-for disabled
:variables variables))
(spacemacs-buffer/warning "Cannot find layer %S !" name-sym)
nil)))
@ -752,7 +755,7 @@ path."
(mapc (lambda (layer)
(if (memq layer disabled-for-layers)
(spacemacs-buffer/message
(format " -> ignore pre-init (disabled for %S)..." layer))
(format " -> ignored pre-init (%S)..." layer))
(spacemacs-buffer/message
(format " -> pre-init (%S)..." layer))
(condition-case err
@ -772,7 +775,7 @@ path."
(mapc (lambda (layer)
(if (memq layer disabled-for-layers)
(spacemacs-buffer/message
(format " -> ignore post-init (disabled for %S)..." layer))
(format " -> ignored post-init (%S)..." layer))
(spacemacs-buffer/message
(format " -> post-init (%S)..." layer))
(condition-case err

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

@ -577,8 +577,7 @@
(mocker-let
((spacemacs-buffer/message (m) ((:output nil))))
(configuration-layer//configure-package pkg)
(should (equal '(init) witness))))
)
(should (equal '(init) witness)))))
;; ---------------------------------------------------------------------------
;; configuration-layer//sort-packages