Merge commit '1583a82fdcd387de95d27c384ec590e714d24c6a' as 'packages/ahungry-theme'

[gnu-emacs-elpa] / packages / company / company-keywords.el

diff --git a/packages/company/company-keywords.el b/packages/company/company-keywords.el
index c700af769bee7b235ae94f2dfa160092d6e5cdb7..f426c06ad758e8a97ff6f63f81ca09e86bb8cc38 100644 (file)
--- a/packages/company/company-keywords.el
+++ b/packages/company/company-keywords.el
@@ -210,6 +210,7 @@
     ;; aliases
     (js2-mode . javascript-mode)
     (espresso-mode . javascript-mode)
+    (js-mode . javascript-mode)
     (cperl-mode . perl-mode)
     (jde-mode . java-mode))
   "Alist mapping major-modes to sorted keywords for `company-keywords'.")