From 142e29561966e9a991145947b52a763f9906658c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 14 Jan 2016 19:26:51 +0100
Subject: Emacs: Use js2-mode for jsx files

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

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

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 2c861433..7eff008b 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -1940,7 +1940,8 @@ it though
 
 #+BEGIN_SRC emacs-lisp
   (use-package js2-mode
-    :mode ("\\.js\\'" . js2-mode)
+    :mode (("\\.js\\'" . js2-mode)
+           ("\\.jsx\\'" . js2-jsx-mode))
     :functions js2-next-error
     :config (progn
               (defun ap/javascript-setup ()
@@ -2043,8 +2044,7 @@ of them as well.
     :mode (("/views/.*\\.php\\'" . web-mode)
            ("/layouts/.*\\.html\\'" . web-mode)
            ("/templates/.*\\.php\\'" . web-mode)
-           ("\\.ejs\\'" . web-mode)
-           ("\\.jsx\\'" . web-mode))
+           ("\\.ejs\\'" . web-mode))
     :config (setq web-mode-code-indent-offset 4
                   web-mode-css-indent-offset 4
                   web-mode-markup-indent-offset 4
-- 
cgit 1.4.1