X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/0a6bfa96e02140c76cd80219444ac1b9d42ea197..c6d53302b114ba50a8e48ce98b906849fded86f4:/company-capf.el

diff --git a/company-capf.el b/company-capf.el
index 6554782d1..866fd625d 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -72,13 +72,10 @@
     (`prefix
      (let ((res (company--capf-data)))
        (when res
-         (let* ((f (plist-get (nthcdr 4 res) :company-prefix-length))
-                (beg (nth 1 res))
-                (end (nth 2 res))
-                (length (and f (funcall f beg (point))))
-                (prefix (buffer-substring-no-properties beg (point))))
+         (let ((length (plist-get (nthcdr 4 res) :company-prefix-length))
+               (prefix (buffer-substring-no-properties (nth 1 res) (point))))
            (cond
-            ((> end (point)) 'stop)
+            ((> (nth 2 res) (point)) 'stop)
             (length (cons prefix length))
             (t prefix))))))
     (`candidates
@@ -112,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