Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

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

diff --git a/packages/company/company-xcode.el b/packages/company/company-xcode.el
index ac8d133454e8626ae49ac3cecaf560df2a583fb1..91ae60b85e17904402d6ffc7d27d0848b2a40330 100644 (file)
--- a/packages/company/company-xcode.el
+++ b/packages/company/company-xcode.el
@@ -26,7 +26,7 @@
 ;;; Code:
 
 (require 'company)
-(eval-when-compile (require 'cl))
+(require 'cl-lib)
 
 (defgroup company-xcode nil
   "Completion back-end for Xcode projects."
@@ -62,8 +62,7 @@ valid in most contexts."
               (const "Structure") (const "Type") (const "Union")
               (const "Variable") (const "Function")))
 
-(defvar company-xcode-project 'unknown)
-(make-variable-buffer-local 'company-xcode-project)
+(defvar-local company-xcode-project 'unknown)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -109,7 +108,7 @@ valid in most contexts."
 (defun company-xcode (command &optional arg &rest ignored)
   "`company-mode' completion back-end for Xcode projects."
   (interactive (list 'interactive))
-  (case command
+  (cl-case command
     (interactive (company-begin-backend 'company-xcode))
     (prefix (and company-xcode-xcodeindex-executable
                  (company-xcode-tags)