Merge commit 'db005182ad0fd05c07e8e5c085abe6c750e6c578' from ivy

[gnu-emacs-elpa] / packages / ivy / colir.el

diff --git a/packages/ivy/colir.el b/packages/ivy/colir.el
index e11ef7dd17d13e9811fdde41997c197076a44182..792033fca394b5fc38e93782cec6b906f1e1debe 100644 (file)
--- a/packages/ivy/colir.el
+++ b/packages/ivy/colir.el
@@ -77,11 +77,11 @@ Optional argument OBJECT is the string or buffer containing the text.
 See also `font-lock-append-text-property'."
   (let (next prev)
     (while (/= start end)
-      (setq next (next-single-property-change start 'face object end)
-            prev (get-text-property start 'face object))
+      (setq next (next-single-property-change start 'face object end))
+      (setq prev (get-text-property start 'face object))
       (when (listp prev)
         (setq prev (cl-find-if #'atom prev)))
-      (if prev
+      (if (facep prev)
           (let ((background-prev (face-background prev)))
             (progn
               (put-text-property