(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 --git a/lisp/faces.el b/lisp/faces.el
index 87fa61db53c99bea0b99e9f781137b7014711c49..2bd1ffcfc8d49dbeb1e7068e11d1eeba66a70712 100644 (file)
--- 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)