# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1130829547 0
# Node ID 56a63119fa2022d3599c9d37a61398e8bb802476
# Parent  1d442f601f13d6cbb33fd4788ff35ae6ffb72d8b
(face-attribute): Handle the case where a face inherits from
a non-existent face.

diff -r 1d442f601f13 -r 56a63119fa20 lisp/faces.el
--- a/lisp/faces.el	Tue Nov 01 07:18:10 2005 +0000
+++ b/lisp/faces.el	Tue Nov 01 07:19:07 2005 +0000
@@ -374,8 +374,11 @@
       ;; 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))