Mercurial > emacs
changeset 58935:95bb6b9a27a3
(header-line, mode-line-inactive, tool-bar):
Use `default' instead of t for setting the defaults.
(face-spec-choose): Separate `t' from `default'.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 13 Dec 2004 19:29:33 +0000 |
| parents | ee02b41be7da |
| children | 92b24762a33f |
| files | lisp/faces.el |
| diffstat | 1 files changed, 22 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Mon Dec 13 19:26:42 2004 +0000 +++ b/lisp/faces.el Mon Dec 13 19:29:33 2004 +0000 @@ -1334,21 +1334,29 @@ (unless frame (setq frame (selected-frame))) (let ((tail spec) - result all) + result defaults) (while tail (let* ((entry (pop tail)) (display (car entry)) - (attrs (cdr entry))) - (when (face-spec-set-match-display display frame) - (setq result (if (null (cdr attrs)) ;; was (listp (car attrs)) - ;; Old-style entry, the attribute list is the - ;; first element. - (car attrs) - attrs)) - (if (eq display t) - (setq all result result nil) + (attrs (cdr entry)) + thisval) + ;; Get the attributes as actually specified by this alternative. + (setq thisval + (if (null (cdr attrs)) ;; was (listp (car attrs)) + ;; Old-style entry, the attribute list is the + ;; first element. + (car attrs) + attrs)) + + ;; If the condition is `default', that sets the default + ;; for following conditions. + (if (eq display 'default) + (setq defaults thisval) + ;; Otherwise, if it matches, use it. + (when (face-spec-set-match-display display frame) + (setq result thisval) (setq tail nil))))) - (if all (append result all) result))) + (if defaults (append result defaults) result))) (defun face-spec-reset-face (face &optional frame) @@ -1786,7 +1794,7 @@ :group 'basic-faces) (defface mode-line-inactive - '((t + '((default :inherit mode-line) (((type x w32 mac) (background light) (class color)) :weight light @@ -1806,7 +1814,7 @@ (put 'modeline-inactive 'face-alias 'mode-line-inactive) (defface header-line - '((t + '((default :inherit mode-line) (((type tty)) ;; This used to be `:inverse-video t', but that doesn't look very @@ -1842,7 +1850,7 @@ (defface tool-bar - '((t + '((default :box (:line-width 1 :style released-button) :foreground "black") (((type x w32 mac) (class color))