Added support for chained predicates.

diff --git a/company.el b/company.el
index 628ced9345be9d49e2c49d681e9576ac3e3d5711..f632baabadc0d491c5ddcad5a6ac0a8b34c8756c 100644 (file)
--- a/company.el
+++ b/company.el
@@ -509,10 +509,16 @@
         (ding)
       (company-set-selection (- company-selection pos 1) t))))
 
+(defsubst company-create-match-predicate (search-string)
+  `(lambda (candidate)
+     ,(if company-candidates-predicate
+          `(and (string-match ,search-string candidate)
+                (funcall ,company-candidates-predicate candidate))
+        `(string-match ,company-search-string candidate))))
+
 (defun company-search-kill-others ()
   (interactive)
-  (let ((predicate `(lambda (candidate)
-                      (string-match ,company-search-string candidate))))
+  (let ((predicate (company-create-match-predicate company-search-string)))
     (setq company-candidates-predicate predicate)
     (company-update-candidates (company-apply-predicate company-candidates
                                                         predicate))