From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 3 Jul 2000 13:47:23 +0000 (+0000)
Subject: (face-spec-set): Ignore invalid attributes like 20.x.
X-Git-Tag: emacs-pretest-21.0.90~3008
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c96308624cadb232feea1ef98246dec7e801ea9b;p=emacs.git

(face-spec-set): Ignore invalid attributes like 20.x.
(face-x-resources): Remove duplicate entry for :font.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 3dc579ec0cc..0cec44b94d2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -263,7 +263,6 @@ If FRAME is omitted or nil, use the selected frame."
     (: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 @@ do it on all frames.  See `defface' for information about SPEC."
 	;; 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)))