X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/18b041423604a09939ce03d93c1af4d572629e33..b8f877703a0d50b46254fcfee3c815ae5e386013:/company-capf.el

diff --git a/company-capf.el b/company-capf.el
index 2f2fba109..866fd625d 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -1,6 +1,6 @@
 ;;; company-capf.el --- company-mode completion-at-point-functions backend -*- lexical-binding: t -*-
 
-;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 
@@ -58,7 +58,8 @@
 
 (defun company--capf-workaround ()
   ;; For http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18067
-  (if (or (not (memq 'python-completion-complete-at-point completion-at-point-functions))
+  (if (or (not (listp completion-at-point-functions))
+          (not (memq 'python-completion-complete-at-point completion-at-point-functions))
           (python-shell-get-process))
       completion-at-point-functions
     (remq 'python-completion-complete-at-point completion-at-point-functions)))
@@ -71,9 +72,12 @@
     (`prefix
      (let ((res (company--capf-data)))
        (when res
-         (if (> (nth 2 res) (point))
-             'stop
-           (buffer-substring-no-properties (nth 1 res) (point))))))
+         (let ((length (plist-get (nthcdr 4 res) :company-prefix-length))
+               (prefix (buffer-substring-no-properties (nth 1 res) (point))))
+           (cond
+            ((> (nth 2 res) (point)) 'stop)
+            (length (cons prefix length))
+            (t prefix))))))
     (`candidates
      (let ((res (company--capf-data)))
        (when res
@@ -105,16 +109,16 @@
            (cdr (assq 'display-sort-function meta))))))
     (`match
      ;; Can't just use 0 when base-size (see above) is non-zero.
-     (let ((start (if (get-text-property 0 'font-lock-face arg)
+     (let ((start (if (get-text-property 0 'face arg)
                       0
-                    (next-single-property-change 0 'font-lock-face arg))))
+                    (next-single-property-change 0 'face arg))))
        (when start
          ;; completions-common-part comes first, but we can't just look for this
          ;; value because it can be in a list.
          (or
-          (let ((value (get-text-property start 'font-lock-face arg)))
+          (let ((value (get-text-property start 'face arg)))
             (text-property-not-all start (length arg)
-                                   'font-lock-face value arg))
+                                   'face value arg))
           (length arg)))))
     (`duplicates t)
     (`no-cache t)   ;Not much can be done here, as long as we handle