From: Juri Linkov <juri@linkov.net>
Date: Mon, 20 Apr 2020 23:48:22 +0000 (+0300)
Subject: * lisp/hi-lock.el (hi-lock--regexps-at-point): Use proper-list-p, not consp.
X-Git-Tag: emacs-28.0.90~7535
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=856d9378a49ec9ec1af2ea74fb9309fe4c39cd1d;p=emacs.git

* lisp/hi-lock.el (hi-lock--regexps-at-point): Use proper-list-p, not consp.
---

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index bf79e48f856..08d82173e41 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -567,8 +567,9 @@ in which case the highlighting will not update as you type."
     (let* ((faces-after (get-text-property (point) 'face))
            (faces-before
             (unless (bobp) (get-text-property (1- (point)) 'face)))
-           (faces-after (if (consp faces-after) faces-after (list faces-after)))
-           (faces-before (if (consp faces-before) faces-before (list faces-before)))
+           ;; Use proper-list-p to handle faces like (foreground-color . "red3")
+           (faces-after (if (proper-list-p faces-after) faces-after (list faces-after)))
+           (faces-before (if (proper-list-p faces-before) faces-before (list faces-before)))
            (faces (mapcar #'hi-lock-keyword->face
                           hi-lock-interactive-patterns))
            (face-after (seq-some (lambda (face) (car (memq face faces))) faces-after))