[Emacs-diffs] Changes to emacs/lisp/faces.el

[Stefan Monnier]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.339 emacs/lisp/faces.el:1.340
*** emacs/lisp/faces.el:1.339   Mon Oct 24 00:08:36 2005
--- emacs/lisp/faces.el Tue Nov  1 07:19:07 2005
***************
*** 374,381 ****
        ;; 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)))))
      (when (and inherit
               (not (eq inherit t))
               (face-attribute-relative-p attribute value))
--- 374,384 ----
        ;; 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))
!           (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))