(font-lock-prepend-text-property, font-lock-append-text-property):

Canonicalize the face and font-lock-face properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5da1bb7b6c6ad3e7c26137985d0fe334519d1dc6..0ab192367524be69c6054c8df42423591645fc6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-29  Richard Stallman  <rms@gnu.org>
 
+       * font-lock.el (font-lock-prepend-text-property)
+       (font-lock-append-text-property): Canonicalize the face and
+       font-lock-face properties.
+
        * faces.el (facep): Doc fix.
 
        * startup.el (fancy-startup-tail, fancy-about-text)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6bc5fd8716f0352f29471da6a539ca59bb793f5f..bc7e7f1e3255a0776af398d238325559121f6974 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1295,6 +1295,12 @@ Optional argument OBJECT is the string or buffer containing the text."
     (while (/= start end)
       (setq next (next-single-property-change start prop object end)
            prev (get-text-property start prop object))
+      ;; Canonicalize old forms of face property.
+      (and (memq prop '(face font-lock-face))
+          (listp prev)
+          (or (keywordp (car prev))
+              (memq (car prev) '(foreground-color background-color)))
+          (setq prev (list prev)))
       (put-text-property start next prop
                         (append val (if (listp prev) prev (list prev)))
                         object)
@@ -1309,6 +1315,12 @@ Optional argument OBJECT is the string or buffer containing the text."
     (while (/= start end)
       (setq next (next-single-property-change start prop object end)
            prev (get-text-property start prop object))
+      ;; Canonicalize old forms of face property.
+      (and (memq prop '(face font-lock-face))
+          (listp prev)
+          (or (keywordp (car prev))
+              (memq (car prev) '(foreground-color background-color)))
+          (setq prev (list prev)))
       (put-text-property start next prop
                         (append (if (listp prev) prev (list prev)) val)
                         object)