summaryrefslogtreecommitdiff
path: root/spacemacs
diff options
context:
space:
mode:
authorKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-12 11:30:32 -0400
committerKjetil Orbekk <kjetil.orbekk@gmail.com>2015-10-12 11:30:32 -0400
commit5f138222087fc4e317d9f39ecbb7e33d05f7ec27 (patch)
tree80ddff0c607e7c0a96da5ca2eeafbb8c1a4802fa /spacemacs
parent29014feb3a6bfd248b917a18dc989ee5bce13c34 (diff)
Disable layers with errors, and include site-specific config.
Diffstat (limited to 'spacemacs')
-rw-r--r--spacemacs5
1 files changed, 3 insertions, 2 deletions
diff --git a/spacemacs b/spacemacs
index 3223e41..6271090 100644
--- a/spacemacs
+++ b/spacemacs
@@ -28,13 +28,13 @@ values."
emacs-lisp
shell
c-c++
- semantic
+ ;; semantic
haskell
html
javascript
markdown
haskell
- git
+ ;; git
markdown
org
;; (shell :variables
@@ -209,6 +209,7 @@ user code."
(if (region-active-p)
(kill-region (region-beginning) (region-end))
(backward-kill-word arg)))
+ (load-file "~/.spacemacs.local")
)
(defun dotspacemacs/user-config ()