Mercurial > hg > xemacs-beta

comparison lisp/faces.el @ 4222:38ef5a6da799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-10-13 14:08:26 by aidan] Fix the nomule package build; eliminate some non-X compile time warnings.
author aidan
date Sat, 13 Oct 2007 14:08:30 +0000
parents 049dc907c17a
children 5a54ce6dc945
comparison
equal deleted inserted replaced
4221:807c86a7612a 4222:38ef5a6da799
470 (if (null charset) 470 (if (null charset)
471 (face-property-instance face 'font domain) 471 (face-property-instance face 'font domain)
472 (let (matchspec) 472 (let (matchspec)
473 ;; get-charset signals an error if its argument doesn't have an 473 ;; get-charset signals an error if its argument doesn't have an
474 ;; associated charset. 474 ;; associated charset.
475 (setq charset (get-charset charset) 475 (setq charset (if-fboundp #'get-charset
476 (get-charset charset)
477 (error 'unimplemented "Charset support not available"))
476 matchspec (cons charset nil)) 478 matchspec (cons charset nil))
477 (or (null (setcdr matchspec 'initial)) 479 (or (null (setcdr matchspec 'initial))
478 (face-property-matching-instance 480 (face-property-matching-instance
479 face 'font matchspec domain) 481 face 'font matchspec domain)
480 (null (setcdr matchspec 'final)) 482 (null (setcdr matchspec 'final))
2057 (set-face-foreground 'isearch-secondary 2059 (set-face-foreground 'isearch-secondary
2058 '(((win default color) . "red3")) 2060 '(((win default color) . "red3"))
2059 'global) 2061 'global)
2060 2062
2061 ;; Define some logical color names to be used when reading the pixmap files. 2063 ;; Define some logical color names to be used when reading the pixmap files.
2062 (if (featurep 'xpm) 2064 (and-boundp
2063 (setq xpm-color-symbols 2065 'xpm-color-symbols
2064 (list 2066 (featurep 'xpm)
2065 '("foreground" (face-foreground 'default)) 2067 (setq xpm-color-symbols
2066 '("background" (face-background 'default)) 2068 (list
2067 '("backgroundToolBarColor" 2069 '("foreground" (face-foreground 'default))
2068 (or 2070 '("background" (face-background 'default))
2069 (and 2071 '("backgroundToolBarColor"
2070 (featurep 'x) 2072 (or
2071 (x-get-resource "backgroundToolBarColor" 2073 (and
2072 "BackgroundToolBarColor" 'string 2074 (featurep 'x)
2073 nil nil 'warn)) 2075 (x-get-resource "backgroundToolBarColor"
2074 2076 "BackgroundToolBarColor" 'string
2075 (face-background 'toolbar))) 2077 nil nil 'warn))
2076 '("foregroundToolBarColor" 2078
2077 (or 2079 (face-background 'toolbar)))
2078 (and 2080 '("foregroundToolBarColor"
2079 (featurep 'x) 2081 (or
2080 (x-get-resource "foregroundToolBarColor" 2082 (and
2081 "ForegroundToolBarColor" 'string 2083 (featurep 'x)
2082 nil nil 'warn)) 2084 (x-get-resource "foregroundToolBarColor"
2083 (face-foreground 'toolbar))) 2085 "ForegroundToolBarColor" 'string
2084 ))) 2086 nil nil 'warn))
2087 (face-foreground 'toolbar)))
2088 )))
2085 2089
2086 (when (featurep 'tty) 2090 (when (featurep 'tty)
2087 (set-face-highlight-p 'bold t 'global '(default tty)) 2091 (set-face-highlight-p 'bold t 'global '(default tty))
2088 (set-face-underline-p 'italic t 'global '(default tty)) 2092 (set-face-underline-p 'italic t 'global '(default tty))
2089 (set-face-highlight-p 'bold-italic t 'global '(default tty)) 2093 (set-face-highlight-p 'bold-italic t 'global '(default tty))