summaryrefslogtreecommitdiffstats
path: root/lisp/init-javascript.el
diff options
context:
space:
mode:
authorMartin Polden <martin.polden@gmail.com>2014-07-08 12:44:42 +0200
committerMartin Polden <martin.polden@gmail.com>2014-07-08 12:44:42 +0200
commitd789b2180d7a856451505615b7c5105963bf06a9 (patch)
tree766bb619c78f4869d03208dc89dcb294aafe80b4 /lisp/init-javascript.el
parenta9a5c9b17ca6e1fac5b15facddb6612d529b78ad (diff)
Prevent js2-mode from overriding M-j
Diffstat (limited to 'lisp/init-javascript.el')
-rw-r--r--lisp/init-javascript.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/init-javascript.el b/lisp/init-javascript.el
index d692851..1c6993f 100644
--- a/lisp/init-javascript.el
+++ b/lisp/init-javascript.el
@@ -4,6 +4,10 @@
(require 'js2-mode)
(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+;; don't override M-j
+(eval-after-load "js2-mode"
+ '(define-key js2-mode-map (kbd "M-j") nil))
+
;; js2-mode can't handle json
(require 'js)
(add-to-list 'auto-mode-alist '("\\.json\\'" . js-mode))