From d01b61900295c1647e2ed16470cc5fd32e3e22e0 Mon Sep 17 00:00:00 2001
From: Martin Polden <martin.polden@gmail.com>
Date: Mon, 28 Jul 2014 17:02:07 +0200
Subject: Use js-mode for .jshintrc

---
 lisp/init-javascript.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lisp/init-javascript.el')

diff --git a/lisp/init-javascript.el b/lisp/init-javascript.el
index 4fa7162..ae81c32 100644
--- a/lisp/init-javascript.el
+++ b/lisp/init-javascript.el
@@ -6,6 +6,7 @@
 
 ;; set indent level to 2
 (setq-default js2-basic-offset 2)
+(setq-default js-indent-level 2)
 
 ;; highlight built-in functions, such as filter, forEach and map
 (setq js2-highlight-level 3)
@@ -16,7 +17,7 @@
 
 ;; js2-mode can't handle json
 (require 'js)
-(add-to-list 'auto-mode-alist '("\\.json\\'" . js-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(json\\|jshintrc\\)\\'" . js-mode))
 
 (defun js2-imenu-create-flat-index (&optional alist prefix)
   "Return a flattened alist for `imenu--index-alist'."
-- 
cgit v1.2.3