[elpa] 01/01: * company/company-capf.el: Don't ignore things like semantic-capf.

[Stefan Monnier]

monnier pushed a commit to branch master
in repository elpa.

commit 69014aa7f585eed4b85b3202146a5c63da58d887
Author: Stefan Monnier <address@hidden>
Date:   Sat Jun 14 23:20:16 2014 -0400

    * company/company-capf.el: Don't ignore things like semantic-capf.
---
 .gitignore                       |    1 +
 packages/company/company-capf.el |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5de4b9d..313d9e5 100644
--- 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 3aaeb13..be7292a 100644
--- 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)))