From: Miles Bader <miles@gnu.org>
Date: Tue, 24 Oct 2000 06:16:20 +0000 (+0000)
Subject: (face-spec-set-match-display):
X-Git-Tag: emacs-pretest-21.0.90~642
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c698842f20a69fdc4d0430b7501686a8341023a6;p=emacs.git

(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 e886633d324..8252d273f85 100644
--- 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)