From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 13 Nov 2000 15:03:35 +0000 (+0000)
Subject: (face-spec-set-match-display): Revert the change from
X-Git-Tag: emacs-pretest-21.0.90~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1695ca2b1595c7bae5ac565a034196797085eb41;p=emacs.git

(face-spec-set-match-display): Revert the change from
2000-10-24.  Add a FIXME for after v21.1.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78524c9e2b2..843de781e06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* faces.el (face-spec-set-match-display): Revert the change from
+	2000-10-24.  Add a FIXME for after v21.1.
+
 2000-11-13  Miles Bader  <miles@gnu.org>
 
 	* textmodes/fill.el (skip-line-prefix): New function.
diff --git a/lisp/faces.el b/lisp/faces.el
index 6cf55b0e926..a8c9eee5517 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1146,9 +1146,14 @@ If FRAME is nil, the current FRAME is used."
 	    options (cdr conjunct)
 	    match (cond ((eq req 'type)
 			 (or (memq window-system options)
-			     (if (display-graphic-p frame)
-				 (memq 'graphic options)
-			       (memq 'tty options))
+			     ;; FIXME: This should be revisited to use
+			     ;; display-graphic-p, provided that the
+			     ;; color selection depends on the number
+			     ;; of supported colors, and all defface's
+			     ;; are changed to look at number of colors
+			     ;; instead of (type graphic) etc.
+			     (and (null window-system)
+				  (memq 'tty options))
 			     (and (memq 'motif options)
 				  (featurep 'motif))
 			     (and (memq 'lucid options)