procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(face-attribute): Handle the case where a face inherits from

Browse source 
a non-existent face.
This commit is contained in:
Stefan Monnier 2005-11-01 07:19:07 +00:00
parent 1b5fd09e69
commit 621e71ee73
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/faces.el
View file

@ -374,8 +374,11 @@ completely specified)."
;; VALUE is relative, so merge with inherited faces
(let ((inh-from (face-attribute face :inherit frame)))
(unless (or (null inh-from) (eq inh-from 'unspecified))
(setq value
(face-attribute-merged-with attribute value inh-from frame)))))
(condition-case nil
(setq value
(face-attribute-merged-with attribute value inh-from frame))
;; The `inherit' attribute may point to non existent faces.
(error nil)))))
(when (and inherit
(not (eq inherit t))
(face-attribute-relative-p attribute value))