Mercurial > emacs
changeset 95863:d4b7c9244713
(set-face-attribute): Parse "FOUNDRY-FAMILY" here.
(face-x-resources): Add :foundry.
(face-valid-attribute-values): Likewise.
(face-attribute-name-alist): Likewise.
(describe-face): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 13 Jun 2008 02:01:07 +0000 |
| parents | afdd781501c8 |
| children | 1388820636da |
| files | lisp/faces.el |
| diffstat | 1 files changed, 12 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Fri Jun 13 01:56:55 2008 +0000 +++ b/lisp/faces.el Fri Jun 13 02:01:07 2008 +0000 @@ -2001,27 +2001,19 @@ "Set frame-local faces of FRAME from face specs and resources. Initialize colors of certain faces from frame parameters." (unless inhibit-face-set-after-frame-default - (or (eq (face-attribute 'default :font t) 'unspecified) + (if (face-attribute 'default :font t) (set-face-attribute 'default frame :font - (face-attribute 'default :font t))) - (or (eq (face-attribute 'default :family t) 'unspecified) - (set-face-attribute 'default frame :family - (face-attribute 'default :family t))) - (or (eq (face-attribute 'default :foundry t) 'unspecified) - (set-face-attribute 'default frame :foundry - (face-attribute 'default :foundry t))) - (or (eq (face-attribute 'default :height t) 'unspecified) - (set-face-attribute 'default frame :height - (face-attribute 'default :height t))) - (or (eq (face-attribute 'default :slant t) 'unspecified) - (set-face-attribute 'default frame :slant - (face-attribute 'default :slant t))) - (or (eq (face-attribute 'default :weight t) 'unspecified) - (set-face-attribute 'default frame :weight - (face-attribute 'default :weight t))) - (or (eq (face-attribute 'default :width t) 'unspecified) - (set-face-attribute 'default frame :width - (face-attribute 'default :width t)))) + (face-attribute 'default :font t)) + (set-face-attribute 'default frame :family + (face-attribute 'default :family t)) + (set-face-attribute 'default frame :height + (face-attribute 'default :height t)) + (set-face-attribute 'default frame :slant + (face-attribute 'default :slant t)) + (set-face-attribute 'default frame :weight + (face-attribute 'default :weight t)) + (set-face-attribute 'default frame :width + (face-attribute 'default :width t)))) ;; Find attributes that should be initialized from frame parameters. (let ((face-params '((foreground-color default :foreground) (background-color default :background)