* lisp/faces.el (face-spec-set-match-display): Don't match toolkit

options on terminal frames.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71c7eedb33527e5215cadbf752fdb9b6a072a0a8..d0f08795ed3fc36199ef2897682ee9d02089540c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-30  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * faces.el (face-spec-set-match-display): Don't match toolkit
+       options on terminal frames.
+
 2011-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/pascal.el: Use lexical binding.

diff --git a/lisp/faces.el b/lisp/faces.el
index e7cfa200602241fd1f5e8f010a8d5c21608600f9..3fb8bc80931c89af1a3796f2c982732651c07c2d 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1451,18 +1451,18 @@ If FRAME is nil, the current FRAME is used."
                             ;; of supported colors, and all defface's
                             ;; are changed to look at number of colors
                             ;; instead of (type graphic) etc.
-                            (and (null (window-system frame))
-                                 (memq 'tty options))
-                            (and (memq 'motif options)
-                                 (featurep 'motif))
-                            (and (memq 'gtk options)
-                                 (featurep 'gtk))
-                            (and (memq 'lucid options)
-                                 (featurep 'x-toolkit)
-                                 (not (featurep 'motif))
-                                 (not (featurep 'gtk)))
-                            (and (memq 'x-toolkit options)
-                                 (featurep 'x-toolkit))))
+                            (if (null (window-system frame))
+                                (memq 'tty options)
+                              (or (and (memq 'motif options)
+                                       (featurep 'motif))
+                                  (and (memq 'gtk options)
+                                       (featurep 'gtk))
+                                  (and (memq 'lucid options)
+                                       (featurep 'x-toolkit)
+                                       (not (featurep 'motif))
+                                       (not (featurep 'gtk)))
+                                  (and (memq 'x-toolkit options)
+                                       (featurep 'x-toolkit))))))
                        ((eq req 'min-colors)
                         (>= (display-color-cells frame) (car options)))
                        ((eq req 'class)