Commit 621e71ee authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

a non-existent face.
parent 1b5fd09e
......@@ -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))
......
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