From de61d68652313f4d08c65e2c94e2b5a4c0d22004 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 29 Mar 2017 23:46:35 -0400
Subject: [PATCH] rjsx-mode: remove electric <, replace with snippets; enable
 emmet-mode in rjsx-mode

---
 modules/lang/javascript/config.el | 3 +++
 modules/lang/web/config.el        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index eb3f84509..cbd4146c8 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -102,6 +102,9 @@
   :commands rjsx-mode
   :mode "\\.jsx$"
   :config
+  ;; disable electric keys (I use snippets and `emmet-mode' instead)
+  (define-key rjsx-mode-map "<" nil)
+  (define-key rjsx-mode-map (kbd "C-d") nil)
   (add-hook! rjsx-mode
     ;; jshint doesn't really know how to deal with jsx
     (push 'javascript-jshint flycheck-disabled-checkers)))
diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el
index c2bacf2e0..147da7de7 100644
--- a/modules/lang/web/config.el
+++ b/modules/lang/web/config.el
@@ -17,7 +17,8 @@
   :commands emmet-mode
   :preface (defvar emmet-mode-keymap (make-sparse-keymap))
   :init
-  (add-hook! (css-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
+  (add-hook! (css-mode web-mode html-mode haml-mode nxml-mode rjsx-mode)
+    'emmet-mode)
   :config
   (setq emmet-move-cursor-between-quotes t)
   (map! :map emmet-mode-keymap