master 48373e7 2/2: Merge branch 'completion-first-difference_face'

[Thierry Volpiatto]

branch: master
commit 48373e754034358b5afd8c2ed21d38278eb3141a
Merge: bcf4201 4095a00
Author: Thierry Volpiatto <address@hidden>
Commit: Thierry Volpiatto <address@hidden>

    Merge branch 'completion-first-difference_face'
---
 lisp/minibuffer.el | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 779c3c8..c2183a6 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -3171,18 +3171,21 @@ one-letter-long matches).")
            (funcall update-score start start)
            (while md
              (funcall update-score start (car md))
-             (put-text-property start (pop md)
-                                'face 'completions-common-part
-                                str)
+             (add-face-text-property
+              start (pop md)
+              'completions-common-part
+              nil str)
              (setq start (pop md)))
            (funcall update-score len len)
-           (put-text-property start end
-                              'face 'completions-common-part
-                              str)
+           (add-face-text-property
+            start end
+            'completions-common-part
+            nil str)
            (if (> (length str) pos)
-               (put-text-property pos (1+ pos)
-                                  'face 'completions-first-difference
-                                  str))
+               (add-face-text-property
+                pos (1+ pos)
+                'completions-first-difference
+                nil str))
            (unless (zerop (length str))
              (put-text-property
               0 1 'completion-score