Commit dcb79f20 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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

options on terminal frames.
parent cb79b8c0
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.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment