summary refs log tree commit diff stats
path: root/tag-emacs/emacs.d
diff options
context:
space:
mode:
authorAlan Pearce2016-01-14 19:38:17 +0100
committerAlan Pearce2016-01-14 19:38:17 +0100
commit3477d9f8e72164366e7c222515082f47b6d9a962 (patch)
tree1ab15cfc32d77d4bbb7dd843065f52693da8a1ca /tag-emacs/emacs.d
parentf9009077e3781b77c9caaf2ddea066119a742910 (diff)
downloaddotfiles-3477d9f8e72164366e7c222515082f47b6d9a962.tar.lz
dotfiles-3477d9f8e72164366e7c222515082f47b6d9a962.tar.zst
dotfiles-3477d9f8e72164366e7c222515082f47b6d9a962.zip
Emacs: Open composer.lock files with json-mode
Diffstat (limited to 'tag-emacs/emacs.d')
-rw-r--r--tag-emacs/emacs.d/init.org5
1 files changed, 2 insertions, 3 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 01cae19..cf2b362 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1956,8 +1956,6 @@ it though
               (add-hook 'js2-mode-hook #'ap/javascript-setup)
               (setq js2-basic-offset 4
                     js2-include-node-externs t)))
-
-  (add-to-list 'auto-mode-alist '("composer\\.lock" . js-mode))
 #+END_SRC
 
 *** coffee-mode
@@ -1993,7 +1991,8 @@ completions, besides other IDE-like things.
 #+BEGIN_SRC emacs-lisp
   (use-package json-mode
     :mode (("\\.json\\'" . json-mode)
-           ("\\.sailsrc\\'" . json-mode)))
+           ("\\.sailsrc\\'" . json-mode)
+           ("composer\\.lock\\'" . json-mode)))
 #+END_SRC
 
 *** restclient