From: Dave Love <fx@gnu.org>
Date: Sun, 12 Mar 2000 15:25:35 +0000 (+0000)
Subject: (enriched-decode-foreground): Use display-color-p.
X-Git-Tag: emacs-pretest-21.0.90~4673
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04c26901e2e10b145ca7facb7589a8192c56e280;p=emacs.git

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

diff --git a/lisp/enriched.el b/lisp/enriched.el
index a7f3ad6cdf5..08c0cec8955 100644
--- 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)))