Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

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

diff --git a/packages/company/company-etags.el b/packages/company/company-etags.el
index 0c84458a1b8f278e035a05678a3c8339d9b4d86e..8634103fe9f346df1c15819dd3294f93bec90e36 100644 (file)
--- a/packages/company/company-etags.el
+++ b/packages/company/company-etags.el
@@ -25,8 +25,8 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
 (require 'company)
+(require 'cl-lib)
 (require 'etags)
 
 (defgroup company-etags nil
@@ -51,9 +51,9 @@ buffer automatically."
 (make-variable-buffer-local 'company-etags-buffer-table)
 
 (defun company-etags-find-table ()
-  (let ((file (company-locate-dominating-file (or buffer-file-name
-                                                  default-directory)
-                                              "TAGS")))
+  (let ((file (locate-dominating-file (or buffer-file-name
+                                          default-directory)
+                                      "TAGS")))
     (when file
       (list (expand-file-name file)))))
 
@@ -76,7 +76,7 @@ buffer automatically."
 (defun company-etags (command &optional arg &rest ignored)
   "`company-mode' completion back-end for etags."
   (interactive (list 'interactive))
-  (case command
+  (cl-case command
     (interactive (company-begin-backend 'company-etags))
     (prefix (and (apply 'derived-mode-p company-etags-modes)
                  (not (company-in-string-or-comment))