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

a non-existent face.

(face-attribute): Handle the case where a face inherits from
a non-existent face.
621e71ee · Stefan Monnier · 1b5fd09e · 621e71ee
Commit 621e71ee authored Nov 01, 2005 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

lisp/faces.el lisp/faces.el +5 -2

No files found.
--- 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))