/[emacs]/emacs/lisp/faces.el
ViewVC logotype

Diff of /emacs/lisp/faces.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.339 by rms, Mon Oct 24 00:08:36 2005 UTC revision 1.340 by monnier, Tue Nov 1 07:19:07 2005 UTC
# Line 374  completely specified)." Line 374  completely specified)."
374        ;; VALUE is relative, so merge with inherited faces        ;; VALUE is relative, so merge with inherited faces
375        (let ((inh-from (face-attribute face :inherit frame)))        (let ((inh-from (face-attribute face :inherit frame)))
376          (unless (or (null inh-from) (eq inh-from 'unspecified))          (unless (or (null inh-from) (eq inh-from 'unspecified))
377            (setq value            (condition-case nil
378                  (face-attribute-merged-with attribute value inh-from frame)))))                (setq value
379                        (face-attribute-merged-with attribute value inh-from frame))
380                ;; The `inherit' attribute may point to non existent faces.
381                (error nil)))))
382      (when (and inherit      (when (and inherit
383                 (not (eq inherit t))                 (not (eq inherit t))
384                 (face-attribute-relative-p attribute value))                 (face-attribute-relative-p attribute value))

Legend:
Removed from v.1.339  
changed lines
  Added in v.1.340

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26