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

Fixes: debbugs:9029

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9165df8eba27b4b84fadfd2b591fd5a2aa82a53..34d298fdba3bcd5b10a705dedc1dd2718ec8990b 100644 (file)
--- 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 3c4a3330c819674d7168e70bfd3ad18fd725ebf8..fbe0f30ae6e979187dff9ea605885928d0088094 100644 (file)
--- 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