From 312ae771c0d460d87613682e969b31262d607594 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 13 Jun 2008 02:01:07 +0000 Subject: [PATCH] (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. --- lisp/faces.el | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 87fa61db53c..2bd1ffcfc8d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2001,27 +2001,19 @@ Value is the new frame created." "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) -- 2.39.2