Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

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

diff --git a/packages/company/company-gtags.el b/packages/company/company-gtags.el
index 6b4e399420618407c57d2f0eb05ec1981f75fe14..0ae98d7d62e0d66a33327c27a816398b980056de 100644 (file)
--- a/packages/company/company-gtags.el
+++ b/packages/company/company-gtags.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (require 'company)
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
 
 (defgroup company-gtags nil
   "Completion back-end for GNU Global."
@@ -49,7 +49,7 @@
 (defun company-gtags--tags-available-p ()
   (if (eq company-gtags--tags-available-p 'unknown)
       (setq company-gtags--tags-available-p
-            (company-locate-dominating-file buffer-file-name "GTAGS"))
+            (locate-dominating-file buffer-file-name "GTAGS"))
     company-gtags--tags-available-p))
 
 (defun company-gtags-fetch-tags (prefix)
@@ -75,7 +75,7 @@
 (defun company-gtags (command &optional arg &rest ignored)
   "`company-mode' completion back-end for GNU Global."
   (interactive (list 'interactive))
-  (case command
+  (cl-case command
     (interactive (company-begin-backend 'company-gtags))
     (prefix (and company-gtags-executable
                  (memq major-mode company-gtags-modes)