Merge commit '2ef6263c65a109b4d36503e6484fdbf4cb307d0f' from company

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

diff --git a/packages/company/company-gtags.el b/packages/company/company-gtags.el
index d2f1e78ebb0a9ea80b21c8b97dbe78543067fecf..70c5ad5dd86f17fa5acdfe6fd0c42ef99922c833 100644 (file)
--- a/packages/company/company-gtags.el
+++ b/packages/company/company-gtags.el
@@ -48,7 +48,12 @@
 
 (defvar-local company-gtags--tags-available-p 'unknown)
 
-(defvar company-gtags-modes '(c-mode c++-mode jde-mode java-mode php-mode))
+(defcustom company-gtags-modes '(prog-mode jde-mode)
+  "Modes that use `company-gtags'.
+In all these modes (and their derivatives) `company-gtags' will perform
+completion."
+  :type '(repeat (symbol :tag "Major mode"))
+  :package-version '(company . "0.8.4"))
 
 (defun company-gtags--tags-available-p ()
   (if (eq company-gtags--tags-available-p 'unknown)
@@ -90,7 +95,7 @@
   (cl-case command
     (interactive (company-begin-backend 'company-gtags))
     (prefix (and company-gtags-executable
-                 (memq major-mode company-gtags-modes)
+                 (apply #'derived-mode-p company-gtags-modes)
                  (not (company-in-string-or-comment))
                  (company-gtags--tags-available-p)
                  (or (company-grab-symbol) 'stop)))