* company/company-capf.el: Don't ignore things like semantic-capf.

diff --git a/.gitignore b/.gitignore
index 5de4b9de622b02bb80bf83ed366b6c7cc151d5d2..313d9e5750360baa41c42d21da505b24d09df4e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.elc
+*.orig
 *~
 ChangeLog
 core

diff --git a/packages/company/company-capf.el b/packages/company/company-capf.el
index 3aaeb137a8000550d61b5be4388651cb6a775235..be7292ab7ee2ab065ea48efd5482a895e14dc054 100644 (file)
--- a/packages/company/company-capf.el
+++ b/packages/company/company-capf.el
@@ -36,9 +36,12 @@
   (remove-hook 'company-completion-finished-hook 'company--capf-clear-data t))
 
 (defun company--capf-data ()
-  ;; Ignore tags-completion-at-point-function because it subverts company-etags
-  ;; in the default value of company-backends, where the latter comes later.
-  (cl-letf* (((default-value 'completion-at-point-functions) nil)
+  (cl-letf* (((default-value 'completion-at-point-functions)
+              ;; Ignore tags-completion-at-point-function because it subverts
+              ;; company-etags in the default value of company-backends, where
+              ;; the latter comes later.
+              (remove 'tags-completion-at-point-function
+                      (default-value 'completion-at-point-functions)))
              (data (run-hook-wrapped 'completion-at-point-functions
                                      ;; Ignore misbehaving functions.
                                      #'completion--capf-wrapper 'optimist)))