mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00
Code Issues Releases Activity

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

Browse Source 
options on terminal frames.
This commit is contained in:
Andreas Schwab 2011-04-30 19:57:07 +02:00
parent cb79b8c051
commit dcb79f208a
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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.

24
lisp/faces.el
View File

@ -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)