summaryrefslogtreecommitdiffstats
path: root/lisp/init-javascript.el
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2014-07-28 17:02:07 +0200
committerMartin Polden <martin.polden@gmail.com>2014-07-28 17:06:32 +0200
commitd01b61900295c1647e2ed16470cc5fd32e3e22e0 (patch)
treebe06eea4212a8d948a81ebfc3c3f686da1c3e086 /lisp/init-javascript.el
parent313ec3d2f5e1976b3768aa0c705c84b23c02d9c2 (diff)
Use js-mode for .jshintrc
Diffstat (limited to 'lisp/init-javascript.el')
-rw-r--r--lisp/init-javascript.el3
1 files changed, 2 insertions, 1 deletions
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'."