(enriched-decode-foreground, enriched-decode-background):

Use proper format for desired elts of `face' property.
Don't test display-color-p; make the properties unconditionally.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b069d37395fd858646ec2cb49c6b419011f762e..fd8bdb3cb4d626d27e92b6e74c09f6d78b154360 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2002-04-06  Richard M. Stallman  <rms@gnu.org>
 
+       * enriched.el (enriched-decode-foreground, enriched-decode-background):
+       Use proper format for desired elts of `face' property.
+       Don't test display-color-p; make the properties unconditionally.
+
        * progmodes/compile.el (compilation-error-regexp-alist):
        New alternatives for FILE:LINE.COL and for ranges of columns and lines.
 

diff --git a/lisp/enriched.el b/lisp/enriched.el
index 8edf7c730e2bccadb33e45e4e745b8bac6a956d2..e74cb6b8ba75f056f3f9a80619f3bbdd1eed427c 100644 (file)
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -432,19 +432,15 @@ Return value is \(begin end name positive-p), or nil if none was found."
       (delete-char 1)))
 
 (defun enriched-decode-foreground (from to &optional color)
-  (if (and color (display-color-p))
-      (list from to 'face (cons ':foreground color))
-    (if (null color)
-       (message "Warning: no color specified for <x-color>")
-      (message "Warning: color `%s' can't be displayed" color))
+  (if color
+      (list from to 'face (list ':foreground color))
+    (message "Warning: no color specified for <x-color>")
     nil))
 
 (defun enriched-decode-background (from to &optional color)
-  (if (and color (display-color-p))
-      (list from to 'face (cons ':background color))
-    (if (null color)
-       (message "Warning: no color specified for <x-bg-color>")
-      (message "Warning: color `%s' can't be displayed" color))
+  (if color
+      (list from to 'face (list ':background color))
+    (message "Warning: no color specified for <x-bg-color>")
     nil))
 \f
 ;;; Handling the `display' property.