summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2000-10-24 06:16:20 +0000
committerMiles Bader <miles@gnu.org>2000-10-24 06:16:20 +0000
commitc698842f20a69fdc4d0430b7501686a8341023a6 (patch)
tree162d4ba844875a98e8ce6a4e8cf0c54d362e12ea /lisp/faces.el
parent32cf3ee07d9a73bf04de768bc291cef20d8edc43 (diff)
downloademacs-c698842f20a69fdc4d0430b7501686a8341023a6.tar.gz
(face-spec-set-match-display):
Add `graphic' display type (the inverse of `tty'). Use `display-graphic-p' instead of the window-system variable.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el5
1 files changed, 3 insertions, 2 deletions
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)