branch: master
commit efd1f09bbc4beb08c4221a6ff497c3cc832320cf
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
Make ivy-display-style more compatible with 24.3
* ivy.el (ivy--format-minibuffer-line): Use
`font-lock-append-text-property' instead of
`add-face-text-property'. It's not optimal, since the new face needs
to be put in front, but at least it doesn't error out.
---
ivy.el | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ivy.el b/ivy.el
index c5aeb9b..bfec0fe 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1560,12 +1560,19 @@ This string will be inserted into the minibuffer.")
(t
(nth (1+ (mod (+ i 2) (1- (length
swiper-minibuffer-faces))))
swiper-minibuffer-faces)))))
- (add-face-text-property
- (match-beginning i)
- (match-end i)
- face
- nil
- str))
+ (if (fboundp 'add-face-text-property)
+ (add-face-text-property
+ (match-beginning i)
+ (match-end i)
+ face
+ nil
+ str)
+ (font-lock-append-text-property
+ (match-beginning i)
+ (match-end i)
+ 'face
+ face
+ str)))
(cl-incf i)))))
str))
