Mercurial > hg > xemacs-beta

comparison lisp/faces.el @ 4676:e3feb329bda9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the initialisation of xpm-color-symbols a bit more reasonable. 2009-08-16 Aidan Kehoe <kehoea@parhasard.net> * faces.el (xpm-color-symbols): Call (featurep 'x) when faces.elc is dumped, not repeatedly (myriad times) at image instantiation time.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 16 Aug 2009 14:58:57 +0100
parents 5a54ce6dc945
children e14f9fdd5096
comparison
equal deleted inserted replaced
4675:9a1a59b4b75d 4676:e3feb329bda9
2066 (featurep 'xpm) 2066 (featurep 'xpm)
2067 (setq xpm-color-symbols 2067 (setq xpm-color-symbols
2068 (list 2068 (list
2069 '("foreground" (face-foreground 'default)) 2069 '("foreground" (face-foreground 'default))
2070 '("background" (face-background 'default)) 2070 '("background" (face-background 'default))
2071 '("backgroundToolBarColor" 2071 `("backgroundToolBarColor"
2072 (or 2072 ,(if (featurep 'x)
2073 (and 2073 '(or (x-get-resource "backgroundToolBarColor"
2074 (featurep 'x) 2074 "BackgroundToolBarColor" 'string
2075 (x-get-resource "backgroundToolBarColor" 2075 nil nil 'warn)
2076 "BackgroundToolBarColor" 'string 2076 (face-background 'toolbar))
2077 nil nil 'warn)) 2077 '(face-background 'toolbar)))
2078 2078 `("foregroundToolBarColor"
2079 (face-background 'toolbar))) 2079 ,(if (featurep 'x)
2080 '("foregroundToolBarColor" 2080 '(or (x-get-resource "foregroundToolBarColor"
2081 (or 2081 "ForegroundToolBarColor" 'string
2082 (and 2082 nil nil 'warn)
2083 (featurep 'x) 2083 (face-foreground 'toolbar))
2084 (x-get-resource "foregroundToolBarColor" 2084 '(face-foreground 'toolbar))))))
2085 "ForegroundToolBarColor" 'string
2086 nil nil 'warn))
2087 (face-foreground 'toolbar)))
2088 )))
2089 2085
2090 (when (featurep 'tty) 2086 (when (featurep 'tty)
2091 (set-face-highlight-p 'bold t 'global '(default tty)) 2087 (set-face-highlight-p 'bold t 'global '(default tty))
2092 (set-face-underline-p 'italic t 'global '(default tty)) 2088 (set-face-underline-p 'italic t 'global '(default tty))
2093 (set-face-highlight-p 'bold-italic t 'global '(default tty)) 2089 (set-face-highlight-p 'bold-italic t 'global '(default tty))