[elpa] master f2327bc 19/23: Merge pull request #575 from Wilfred/patch-1

[Dmitry Gutov]

branch: master
commit f2327bc7f303fcf83c3d8f9c76f61deaa110ebb5
Merge: 917936c ac2606a
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #575 from Wilfred/patch-1
    
    company-keywords: Add JSX modes to javascript aliases
---
 company-keywords.el |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/company-keywords.el b/company-keywords.el
index e6da028..fac37f5 100644
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -233,8 +233,10 @@
      )
     ;; aliases
     (js2-mode . javascript-mode)
+    (js2-jsx-mode . javascript-mode)
     (espresso-mode . javascript-mode)
     (js-mode . javascript-mode)
+    (js-jsx-mode . javascript-mode)
     (cperl-mode . perl-mode)
     (jde-mode . java-mode)
     (ess-julia-mode . julia-mode))