Enable company-search-map in company-search-mode body

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

diff --git a/company-keywords.el b/company-keywords.el
index 461fdf6b04ec4b506073c945a7e7c952224bd737..f426c06ad758e8a97ff6f63f81ca09e86bb8cc38 100644 (file)
--- a/company-keywords.el
+++ b/company-keywords.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (require 'company)
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
 
 (defun company-keywords-upper-lower (&rest lst)
   ;; Upcase order is different for _.
@@ -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'.")
@@ -218,7 +219,7 @@
 (defun company-keywords (command &optional arg &rest ignored)
   "`company-mode' back-end for programming language keywords."
   (interactive (list 'interactive))
-  (case command
+  (cl-case command
     (interactive (company-begin-backend 'company-keywords))
     (prefix (and (assq major-mode company-keywords-alist)
                  (not (company-in-string-or-comment))