X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/3dc7169f617fbaeac115e8089e470fc115ae444f..46fb87539e16f7243698a839933fd8eb74a7f75b:/packages/company/company-etags.el diff --git a/packages/company/company-etags.el b/packages/company/company-etags.el index 0c84458a1..c7ba60870 100644 --- 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 @@ -42,18 +42,18 @@ buffer automatically." (defcustom company-etags-ignore-case nil "Non-nil to ignore case in completion candidates." - :type 'boolean) + :type 'boolean + :package-version '(company . "0.7.3")) (defvar company-etags-modes '(prog-mode c-mode objc-mode c++-mode java-mode jde-mode pascal-mode perl-mode python-mode)) -(defvar company-etags-buffer-table 'unknown) -(make-variable-buffer-local 'company-etags-buffer-table) +(defvar-local company-etags-buffer-table 'unknown) (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))