(face-spec-set-2): Don't pass invalid attributes to set-face-attribute.

diff --git a/lisp/faces.el b/lisp/faces.el
index 0db620c2fe58cf5364f6b961170e281f3d27ed82..cab7f5b52cc578c9756b5dd314f17afa47099ce1 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1556,7 +1556,14 @@ then the override spec."
 
 (defun face-spec-set-2 (face frame spec)
   "Set the face attributes of FACE on FRAME according to SPEC."
-  (apply 'set-face-attribute face frame (face-spec-choose spec frame)))
+  (let* ((spec (face-spec-choose spec frame))
+        attrs)
+    (while spec
+      (when (assq (car spec) face-x-resources)
+       (push (car spec) attrs)
+       (push (cadr spec) attrs))
+      (setq spec (cddr spec)))
+    (apply 'set-face-attribute face frame (nreverse attrs))))
 
 (defun face-attr-match-p (face attrs &optional frame)
   "Return t if attributes of FACE match values in plist ATTRS.