aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKévin Le Gouguec2019-05-12 18:36:09 +0200
committerNoam Postavsky2019-05-13 20:41:02 -0400
commit59ad303e8f3bb174ce326c76a9e7649f602120db (patch)
tree596dae129b3e32c38b6f9b1c003b0005e62ddf10 /lisp
parent364d4e156d80bff711d000bdb2e0ac765726c953 (diff)
downloademacs-59ad303e8f3bb174ce326c76a9e7649f602120db.tar.gz
emacs-59ad303e8f3bb174ce326c76a9e7649f602120db.zip
Stop splicing anonymous faces in font-lock-append-text-property
This is the same fix as 2019-04-29 "Refrain from splicing anonymous faces in text properties", which was only applied to font-lock-prepend-text-property. * lisp/font-lock.el (font-lock-append-text-property): Distinguish list of faces from property list. * test/lisp/font-lock-tests.el: New test suite. (Bug#35476)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/font-lock.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7ff4e606fa6..95ca2f99c21 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1417,7 +1417,12 @@ Optional argument OBJECT is the string or buffer containing the text."
1417Arguments PROP and VALUE specify the property and value to append to the value 1417Arguments PROP and VALUE specify the property and value to append to the value
1418already in place. The resulting property values are always lists. 1418already in place. The resulting property values are always lists.
1419Optional argument OBJECT is the string or buffer containing the text." 1419Optional argument OBJECT is the string or buffer containing the text."
1420 (let ((val (if (listp value) value (list value))) next prev) 1420 (let ((val (if (and (listp value) (not (keywordp (car value))))
1421 ;; Already a list of faces.
1422 value
1423 ;; A single face (e.g. a plist of face properties).
1424 (list value)))
1425 next prev)
1421 (while (/= start end) 1426 (while (/= start end)
1422 (setq next (next-single-property-change start prop object end) 1427 (setq next (next-single-property-change start prop object end)
1423 prev (get-text-property start prop object)) 1428 prev (get-text-property start prop object))