# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1198955542 0
# Node ID f99fcd1db425d61187759c34d34c7abb48c650ad
# Parent  ec8eb07f75bfee10b3adbcf8a6907871cb06cc18
(font-lock-prepend-text-property, font-lock-append-text-property):
Canonicalize the face and font-lock-face properties.

diff -r ec8eb07f75bf -r f99fcd1db425 lisp/font-lock.el
--- a/lisp/font-lock.el	Sat Dec 29 19:10:34 2007 +0000
+++ b/lisp/font-lock.el	Sat Dec 29 19:12:22 2007 +0000
@@ -1295,6 +1295,12 @@
     (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 @@
     (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)