[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104063: * lisp/faces.el (face-spec-s
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104063: * lisp/faces.el (face-spec-set-match-display): Don't match toolkit |
Date: |
Sat, 30 Apr 2011 19:57:07 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104063
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-04-30 19:57:07 +0200
message:
* lisp/faces.el (face-spec-set-match-display): Don't match toolkit
options on terminal frames.
modified:
lisp/ChangeLog
lisp/faces.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-04-30 15:15:07 +0000
+++ b/lisp/ChangeLog 2011-04-30 17:57:07 +0000
@@ -1,3 +1,8 @@
+2011-04-30 Andreas Schwab <address@hidden>
+
+ * faces.el (face-spec-set-match-display): Don't match toolkit
+ options on terminal frames.
+
2011-04-29 Stefan Monnier <address@hidden>
* progmodes/pascal.el: Use lexical binding.
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2011-04-19 13:44:55 +0000
+++ b/lisp/faces.el 2011-04-30 17:57:07 +0000
@@ -1451,18 +1451,18 @@
;; 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104063: * lisp/faces.el (face-spec-set-match-display): Don't match toolkit,
Andreas Schwab <=