[Emacs-diffs] /srv/bzr/emacs/trunk r105720: Make `(type graphic)' match `x', `w32' and `ns', like the manual says.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105720
fixes bug(s): http://debbugs.gnu.org/9029
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-11 06:28:07 +0200
message:
  Make `(type graphic)' match `x', `w32' and `ns', like the manual says.
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-11 03:35:02 +0000
+++ b/lisp/ChangeLog    2011-09-11 04:28:07 +0000
@@ -1,5 +1,8 @@
 2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2011-08-24 18:01:40 +0000
+++ b/lisp/faces.el     2011-09-11 04:28:07 +0000
@@ -1445,6 +1445,8 @@
            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