Mercurial > emacs
changeset 30010:281fa98f5c87
(face-spec-set): Ignore invalid attributes like 20.x.
(face-x-resources): Remove duplicate entry for :font.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 03 Jul 2000 13:47:23 +0000 |
| parents | 95bdbefcdac6 |
| children | aa56df73f23a |
| files | lisp/faces.el |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)))