Commit c9630862 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(face-spec-set): Ignore invalid attributes like 20.x.

(face-x-resources): Remove duplicate entry for :font.
parent 4c2ca4f3
......@@ -263,7 +263,6 @@ If FRAME is omitted or nil, use the selected frame."
(".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)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment