From: João Távora <joaotavora@gmail.com>
Date: Thu, 7 Nov 2019 23:54:21 +0000 (+0000)
Subject: Have pcm styles apply faces to face prop, not font-lock-face
X-Git-Tag: emacs-27.0.90~700
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d558d9fa1e0daf7e8f511cac4595c1eeeeeeb177;p=emacs.git

Have pcm styles apply faces to face prop, not font-lock-face

This is the way the basic completion styles work.  This fixes
candidate highlighting in icomplete.

* lisp/minibuffer.el (completion-pcm--hilit-commonality): Apply
faces to 'face property, not font-lock-face.
---

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 43dd277a2e4..cc113b926f3 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3145,16 +3145,16 @@ one-letter-long matches).")
            (while md
              (funcall update-score start (car md))
              (put-text-property start (pop md)
-                                'font-lock-face 'completions-common-part
+                                'face 'completions-common-part
                                 str)
              (setq start (pop md)))
            (funcall update-score len len)
            (put-text-property start end
-                              'font-lock-face 'completions-common-part
+                              'face 'completions-common-part
                               str)
            (if (> (length str) pos)
                (put-text-property pos (1+ pos)
-                                  'font-lock-face 'completions-first-difference
+                                  'face 'completions-first-difference
                                   str))
            (unless (zerop (length str))
              (put-text-property