# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1004465986 0
# Node ID 7f616838d9312adbac9f2509ef32400e1aa1caa8
# Parent  5ee7580050a725afeef90c55ac2c33806e306ce3
(enriched-face-ans): FIx previous change.

diff -r 5ee7580050a7 -r 7f616838d931 lisp/enriched.el
--- a/lisp/enriched.el	Tue Oct 30 17:28:03 2001 +0000
+++ b/lisp/enriched.el	Tue Oct 30 18:19:46 2001 +0000
@@ -347,17 +347,16 @@
 	(and new (enriched-face-ans new))))
 	    
 (defun enriched-face-ans (face)
-  "Return annotations specifying FACE."
+  "Return annotations specifying FACE.
+FACE may be a list of faces instead of a single face;
+it can also be anything allowed as an element of a list
+which can be the value of the `face' text property."
   (cond ((and (consp face) (eq (car face) 'foreground-color))
 	 (list (list "x-color" (cdr face))))
 	((and (consp face) (eq (car face) 'background-color))
 	 (list (list "x-bg-color" (cdr face))))
-	((and (consp face) (symbolp (car face)) (not (keywordp (car face))))
-	 ;; List of faces `(face1 face2 ...)'.
-	 (let ((ans nil))
-	   (dolist (elt face)
-	     (setq ans (append ans (enriched-face-ans elt))))
-	   ans))
+	((listp face)
+	 (apply 'append (mapcar 'enriched-face-ans face)))
 	((string-match "^fg:" (symbol-name face))
 	 (list (list "x-color" (substring (symbol-name face) 3))))
 	((string-match "^bg:" (symbol-name face))