From f6ba59fca119f4decbb28818906fd063b3621413 Mon Sep 17 00:00:00 2001 From: benj Date: Fri, 11 Nov 2016 23:21:51 -0800 Subject: added magit and removed js2 in favor of web-mode --- init.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'init.el') 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) -- cgit v1.2.3