summaryrefslogtreecommitdiffstats
path: root/lisp/init-javascript.el
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2016-02-25 22:47:45 +0100
committerMartin Polden <martin.polden@gmail.com>2016-02-25 23:17:48 +0100
commit3974306870486650a0e5bb6669280bae12b694fe (patch)
treea69574c99d38f15b678dd47dd31f5b163c8079dd /lisp/init-javascript.el
parentc75c977394d062f11dbc1ed0379bf18fcf3c709e (diff)
Use use-package
Diffstat (limited to 'lisp/init-javascript.el')
-rw-r--r--lisp/init-javascript.el22
1 files changed, 14 insertions, 8 deletions
diff --git a/lisp/init-javascript.el b/lisp/init-javascript.el
index 5b61895..b9fd43a 100644
--- a/lisp/init-javascript.el
+++ b/lisp/init-javascript.el
@@ -1,8 +1,18 @@
-(require 'js)
-(add-to-list 'auto-mode-alist '("\\.\\(json\\|jshintrc\\)\\'" . js-mode))
+(use-package js
+ :ensure nil
-;; set indent level to 2
-(setq-default js-indent-level 2)
+ :init
+ ;; set indent level to 2
+ (setq-default js-indent-level 2)
+
+ :mode
+ ;; use js-mode for json and jshint
+ ("\\.\\(json\\|jshintrc\\)\\'" . js-mode)
+
+ :config
+ (add-hook 'js-mode-hook
+ (lambda ()
+ (define-key js-mode-map (kbd "C-c p") 'jq-reformat))))
;; use jq for reformatting json
(defun jq-reformat-region (begin end)
@@ -32,8 +42,4 @@
(jq-reformat-region (region-beginning) (region-end))
(jq-reformat-region (point-min) (point-max))))
-(add-hook 'js-mode-hook
- (lambda ()
- (define-key js-mode-map (kbd "C-c p") 'jq-reformat)))
-
(provide 'init-javascript)