# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 962632043 0
# Node ID 281fa98f5c8710725b25aa06e24443b62a5f4ea2
# Parent  95bdbefcdac64b82cc8073ce2c55a1a59bb6d1da
(face-spec-set): Ignore invalid attributes like 20.x.
(face-x-resources): Remove duplicate entry for :font.

diff -r 95bdbefcdac6 -r 281fa98f5c87 lisp/faces.el
--- a/lisp/faces.el	Mon Jul 03 13:46:03 2000 +0000
+++ b/lisp/faces.el	Mon Jul 03 13:47:23 2000 +0000
@@ -263,7 +263,6 @@
     (:stipple
      (".attributeStipple" . "Face.AttributeStipple")
      (".attributeBackgroundPixmap" . "Face.AttributeBackgroundPixmap"))
-    (:font (".attributeFont" . "Face.AttributeFont"))
     (:bold (".attributeBold" . "Face.AttributeBold"))
     (:italic (".attributeItalic" . "Face.AttributeItalic"))
     (:font (".attributeFont" . "Face.AttributeFont")))
@@ -1167,8 +1166,11 @@
 	;; Support some old-style attribute names and values.
 	(case attribute
 	  (:bold (setq attribute :weight value (if value 'bold 'normal)))
-	  (:italic (setq attribute :slant value (if value 'italic 'normal))))
-	(setq params (cons attribute (cons value params))))
+	  (:italic (setq attribute :slant value (if value 'italic 'normal)))
+	  (t (unless (assq attribute face-x-resources)
+	       (setq attribute nil))))
+	(when attribute
+	  (setq params (cons attribute (cons value params)))))
       (setq attrs (cdr (cdr attrs))))
     (face-spec-reset-face face frame)
     (apply #'set-face-attribute face frame params)))