summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorbenj <benj@rse8.com>2016-11-11 23:21:51 -0800
committerbenj <benj@rse8.com>2016-11-11 23:21:51 -0800
commitf6ba59fca119f4decbb28818906fd063b3621413 (patch)
treec88d5d0e4d3ca6802f5ad99131eedcdf8fdeb0a8 /init.el
parent20d185389026ba556efdcd31e2a952e843dba622 (diff)
downloademacs-f6ba59fca119f4decbb28818906fd063b3621413.tar
emacs-f6ba59fca119f4decbb28818906fd063b3621413.tar.gz
emacs-f6ba59fca119f4decbb28818906fd063b3621413.tar.bz2
emacs-f6ba59fca119f4decbb28818906fd063b3621413.tar.lz
emacs-f6ba59fca119f4decbb28818906fd063b3621413.tar.xz
emacs-f6ba59fca119f4decbb28818906fd063b3621413.tar.zst
emacs-f6ba59fca119f4decbb28818906fd063b3621413.zip
added magit and removed js2 in favor of web-mode
Diffstat (limited to 'init.el')
-rw-r--r--init.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/init.el b/init.el
index a426f5a..4bb05d2 100644
--- a/init.el
+++ b/init.el
@@ -34,7 +34,6 @@
haskell-mode
highlight-escape-sequences
ido-vertical-mode
- js2-mode
magit
markdown-mode
multiple-cursors
@@ -43,6 +42,7 @@
scala-mode
visual-regexp
web-mode
+ yaml-mode
yasnippet)))
(condition-case nil
@@ -65,11 +65,12 @@
(require 'setup-flycheck)
(require 'setup-haskell-mode)
(require 'setup-ido)
-(require 'setup-js-mode)
+(require 'setup-magit)
(require 'setup-markdown-mode)
(require 'setup-multiple-cursors)
(require 'setup-scala-mode)
(require 'setup-web-mode)
+(require 'setup-yaml-mode)
(require 'setup-yasnippet)
(require 'visual-regexp)