diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-11-01 07:19:07 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-11-01 07:19:07 +0000 |
| commit | 621e71ee736bd205fc7be46ee62bdb7fcea7b88c (patch) | |
| tree | 5337043e5c3c02f2fb8a5d83e762ba676ac409af /lisp/faces.el | |
| parent | 1b5fd09e6921a465a1d5cc9614147bc24f4d6269 (diff) | |
| download | emacs-621e71ee736bd205fc7be46ee62bdb7fcea7b88c.tar.gz | |
(face-attribute): Handle the case where a face inherits from
a non-existent face.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 81a6a953aa5..8ca9e40d7d2 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -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)) |