From 3477d9f8e72164366e7c222515082f47b6d9a962 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:38:17 +0100
Subject: Emacs: Open composer.lock files with json-mode

---
 tag-emacs/emacs.d/init.org | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'tag-emacs/emacs.d')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 01cae195..cf2b362a 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
-- 
cgit 1.4.1