(face-spec-set-match-display):

  Add `graphic' display type (the inverse of `tty').
  Use `display-graphic-p' instead of the window-system variable.

diff --git a/lisp/faces.el b/lisp/faces.el
index e886633d3248f5137321dcf5a037ec7b1b4bdaf5..8252d273f85b0fcd2b53b1024d6647e2a9017a8d 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1129,8 +1129,9 @@ If FRAME is nil, the current FRAME is used."
            options (cdr conjunct)
            match (cond ((eq req 'type)
                         (or (memq window-system options)
-                            (and (null window-system)
-                                 (memq 'tty options))
+                            (if (display-graphic-p frame)
+                                (memq 'graphic options)
+                              (memq 'tty options))
                             (and (memq 'motif options)
                                  (featurep 'motif))
                             (and (memq 'lucid options)