# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 974127708 0
# Node ID 45961172564e9746ab48abd946bcfc1d8fe9ac41
# Parent  e82b52295dfb3b4d2ac0cf6457926514df8ebace
(face-spec-set-match-display): Revert the change from
2000-10-24.  Add a FIXME for after v21.1.

diff -r e82b52295dfb -r 45961172564e lisp/faces.el
--- a/lisp/faces.el	Mon Nov 13 13:39:21 2000 +0000
+++ b/lisp/faces.el	Mon Nov 13 15:01:48 2000 +0000
@@ -1146,9 +1146,14 @@
 	    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)