# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1213322467 0
# Node ID d4b7c9244713919273c69077903e728cbacbd395
# Parent  afdd781501c8c12f4238bafffdb5714db799a576
(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.

diff -r afdd781501c8 -r d4b7c9244713 lisp/faces.el
--- 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)