company-capf: strip duplicates

[gnu-emacs-elpa] / company-capf.el

diff --git a/company-capf.el b/company-capf.el
index 8575cd1f5912ba8b2f4f07526014f28925ff82b2..17ebf7cb538208b311ebbf826693fa399b660836 100644 (file)
--- a/company-capf.el
+++ b/company-capf.el
@@ -1,6 +1,6 @@
 ;;; company-capf.el --- company-mode completion-at-point-functions back-end -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2014  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
@@ -34,7 +34,7 @@
           (data (run-hook-wrapped 'completion-at-point-functions
                                   ;; Ignore misbehaving functions.
                                   #'completion--capf-wrapper 'optimist)))
-    (when (consp data) data)))
+    (when (and (consp data) (numberp (nth 1 data))) data)))
 
 (defun company-capf (command &optional arg &rest _args)
   "`company-mode' back-end using `completion-at-point-functions'.
@@ -90,8 +90,9 @@ Requires Emacs 24.1 or newer."
             (text-property-not-all start (length arg)
                                    'face value arg))
           (length arg)))))
-    (`duplicates nil) ;Don't bother.
-    (`no-cache t)     ;FIXME: Improve!
+    (`duplicates t) ;Don't bother.
+    (`no-cache t)   ;Not much can be done here, as long as we handle
+                    ;non-prefix matches.
     (`meta
      (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-docsig)))
        (when f (funcall f arg))))