From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Sun, 6 Nov 2016 17:28:47 +0000 (+0000)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=e6e8c107e8df472980cbeb7da025e6b70732c9fa;hp=--cc;p=max%2Fdotfiles.git

Merge branch 'master' of git.friedersdorff.com:max/dotfiles
---

e6e8c107e8df472980cbeb7da025e6b70732c9fa
diff --cc emacs/.emacs
index b731c30,7fd25c7..ae2f654
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@@ -114,7 -114,23 +114,22 @@@
  (use-package evil-magit
    :ensure t)
  
+ (use-package editorconfig
+   :ensure t
+   :init
+   (add-hook 'prog-mode-hook (editorconfig-mode 1))
+   (add-hook 'text-mode-hook (editorconfig-mode 1)))
+ 
+ (use-package js2-mode
+   :ensure t
+   :config
+   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+   (setq js2-strict-missing-semi-warning nil))
+ 
+ (use-package yaml-mode
+   :ensure t)
+ 
  
 -(add-hook 'after-init-hook 'global-company-mode)
  (use-package wanderlust
    :ensure t)