From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 17 Feb 2014 04:58:16 +0000 (+0200)
Subject: company-capf common-part: look up font-lock-face
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a63952fd2dbe6b5cf58013c868caaba26dc34532

company-capf common-part: look up font-lock-face

Because completion-pcm--hilit-commonality uses it.
---

diff --git a/company-capf.el b/company-capf.el
index f1b46d905..d31f32d0e 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -79,16 +79,16 @@ Requires Emacs 24.1 or newer."
            (cdr (assq 'display-sort-function meta))))))
     (`common-part
      ;; Can't just use 0 when base-size (see above) is non-zero.
-     (let ((start (if (get-text-property 0 'face arg)
+     (let ((start (if (get-text-property 0 'font-lock-face arg)
                       0
-                    (next-single-property-change 0 'face arg))))
+                    (next-single-property-change 0 'font-lock-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 'face arg)))
+          (let ((value (get-text-property start 'font-lock-face arg)))
             (text-property-not-all start (length arg)
-                                   'face value arg))
+                                   'font-lock-face value arg))
           (length arg)))))
     (`duplicates t)
     (`no-cache t)   ;Not much can be done here, as long as we handle