# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 964541125 0
# Node ID 597562b7a8c69cc2429c51171b23b21e89b8032b
# Parent  1130a792b2f74f44b22b4fab9fc484fab1b38ad1
(enriched-face-ans): For a `foreground-color'
property, return '(("x-color" COLOR))' so that COLOR will be
output as a parameter of the x-color annotation.  Likewise for the
`background-color' property.  In the case of normal face
properties, don't return annotations for unspecified foreground
and background face attributes.

diff -r 1130a792b2f7 -r 597562b7a8c6 lisp/enriched.el
--- a/lisp/enriched.el	Tue Jul 25 16:05:09 2000 +0000
+++ b/lisp/enriched.el	Tue Jul 25 16:05:25 2000 +0000
@@ -349,9 +349,9 @@
 (defun enriched-face-ans (face)
   "Return annotations specifying FACE."
   (cond ((and (consp face) (eq (car face) 'foreground-color))
-	 (list "x-color" (cdr face)))
+	 (list (list "x-color" (cdr face))))
 	((and (consp face) (eq (car face) 'background-color))
-	 (list "x-bg-color" (cdr face)))
+	 (list (list "x-bg-color" (cdr face))))
 	((string-match "^fg:" (symbol-name face))
 	 (list (list "x-color" (substring (symbol-name face) 3))))
 	((string-match "^bg:" (symbol-name face))
@@ -361,8 +361,10 @@
 		(props (face-font face t))
 		(ans (cdr (format-annotate-single-property-change
 			   'face nil props enriched-translations))))
-	   (if fg (setq ans (cons (list "x-color" fg) ans)))
-	   (if bg (setq ans (cons (list "x-bg-color" bg) ans)))
+	   (unless (eq fg 'unspecified)
+	     (setq ans (cons (list "x-color" fg) ans)))
+	   (unless (eq bg 'unspecified)
+	     (setq ans (cons (list "x-bg-color" bg) ans)))
 	   ans))))
 
 ;;;