Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
dcb79f20
Commit
dcb79f20
authored
Apr 30, 2011
by
Andreas Schwab
Browse files
* lisp/faces.el (face-spec-set-match-display): Don't match toolkit
options on terminal frames.
parent
cb79b8c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
12 deletions
+17
-12
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/faces.el
lisp/faces.el
+12
-12
No files found.
lisp/ChangeLog
View file @
dcb79f20
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.
...
...
lisp/faces.el
View file @
dcb79f20
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment