From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 11 Sep 2011 04:28:07 +0000 (+0200)
Subject: Make `(type graphic)' match `x', `w32' and `ns', like the manual says.
X-Git-Tag: emacs-pretest-24.0.90~104^2~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee0e9f11ea2823550c4593d0d339b972911358b8;p=emacs.git

Make `(type graphic)' match `x', `w32' and `ns', like the manual says.

Fixes: debbugs:9029
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9165df8eba..34d298fdba3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* faces.el (face-spec-set-match-display): Make `(type graphic)'
+	match `x', `w32' and `ns', like the manual says (bug#9029).
+
 	* subr.el (eval-after-load): Doc string clarification (bug#9125).
 	(process-kill-buffer-query-function): Mention the buffer name in
 	the query.
diff --git a/lisp/faces.el b/lisp/faces.el
index 3c4a3330c81..fbe0f30ae6e 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1445,6 +1445,8 @@ If FRAME is nil, the current FRAME is used."
 	    options (cdr conjunct)
 	    match (cond ((eq req 'type)
 			 (or (memq (window-system frame) options)
+			     (and (memq 'graphic options)
+				  (memq (window-system frame) '(x w32 ns)))
 			     ;; FIXME: This should be revisited to use
 			     ;; display-graphic-p, provided that the
 			     ;; color selection depends on the number