(enriched-decode-foreground): Use display-color-p.

(enriched-decode-background): Likewise.

diff --git a/lisp/enriched.el b/lisp/enriched.el
index a7f3ad6cdf592a60e95a6ed2bfd03208de828a5b..08c0cec89557b85e1ecbb6ded2f903872a9fa8fe 100644 (file)
--- a/lisp/enriched.el
+++ b/lisp/enriched.el
@@ -443,7 +443,7 @@ Return value is \(begin end name positive-p), or nil if none was found."
     (cond ((null color)
           (message "Warning: no color specified for <x-color>"))
          ((internal-find-face face))
-         ((and window-system (facemenu-get-face face)))
+         ((and (display-color-p) (facemenu-get-face face)))
          ((make-face face)
           (message "Warning: color `%s' can't be displayed" color)))
     (list from to 'face face)))
@@ -453,7 +453,7 @@ Return value is \(begin end name positive-p), or nil if none was found."
     (cond ((null color)
           (message "Warning: no color specified for <x-bg-color>"))
          ((internal-find-face face))
-         ((and window-system (facemenu-get-face face)))
+         ((and (display-color-p) (facemenu-get-face face)))
          ((make-face face)
           (message "Warning: color `%s' can't be displayed" color)))
     (list from to 'face face)))