(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 78524c9e2b2b5602d77c33f7773849d92f641868..843de781e06bc9cf93fd75621a53127f19ae8f4b 100644 (file)
--- 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 6cf55b0e9269de47aed63dc702e8c4000d5abf75..a8c9eee55173e742091f01830bcba60a6e31a479 100644 (file)
--- 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)