# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 972368180 0
# Node ID e58bc9a59da79ac36e1b9e42d02f2b832f1f8915
# Parent  09e0924381070b5e48adcb2b653350b839ac1e6e
(face-spec-set-match-display):
  Add `graphic' display type (the inverse of `tty').
  Use `display-graphic-p' instead of the window-system variable.

diff -r 09e092438107 -r e58bc9a59da7 lisp/faces.el
--- a/lisp/faces.el	Tue Oct 24 04:39:01 2000 +0000
+++ b/lisp/faces.el	Tue Oct 24 06:16:20 2000 +0000
@@ -1129,8 +1129,9 @@
 	    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)