Mercurial > emacs

comparison lisp/faces.el @ 83397:693e794b57bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 149-151, 629-641) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-629 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-630 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-631 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-632 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-633 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-634 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-635 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-636 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-637 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-638 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-639 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-640 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-641 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-149 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-150 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-151 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-437
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 07 Nov 2005 14:56:19 +0000
parents b31326248cf6 5271a20d9255
children 03335deca80b
comparison
equal deleted inserted replaced
83396:201f610eb492 83397:693e794b57bf
372 (let ((value (internal-get-lisp-face-attribute face attribute frame))) 372 (let ((value (internal-get-lisp-face-attribute face attribute frame)))
373 (when (and inherit (face-attribute-relative-p attribute value)) 373 (when (and inherit (face-attribute-relative-p attribute value))
374 ;; VALUE is relative, so merge with inherited faces 374 ;; VALUE is relative, so merge with inherited faces
375 (let ((inh-from (face-attribute face :inherit frame))) 375 (let ((inh-from (face-attribute face :inherit frame)))
376 (unless (or (null inh-from) (eq inh-from 'unspecified)) 376 (unless (or (null inh-from) (eq inh-from 'unspecified))
377 (setq value 377 (condition-case nil
378 (face-attribute-merged-with attribute value inh-from frame))))) 378 (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)))))
379 (when (and inherit 382 (when (and inherit
380 (not (eq inherit t)) 383 (not (eq inherit t))
381 (face-attribute-relative-p attribute value)) 384 (face-attribute-relative-p attribute value))
382 ;; We should merge with INHERIT as well 385 ;; We should merge with INHERIT as well
383 (setq value (face-attribute-merged-with attribute value inherit frame))) 386 (setq value (face-attribute-merged-with attribute value inherit frame)))
1443 "Set FACE's attributes according to the first matching entry in SPEC. 1446 "Set FACE's attributes according to the first matching entry in SPEC.
1444 FRAME is the frame whose frame-local face is set. FRAME nil means 1447 FRAME is the frame whose frame-local face is set. FRAME nil means
1445 do it on all frames. See `defface' for information about SPEC. 1448 do it on all frames. See `defface' for information about SPEC.
1446 If SPEC is nil, do nothing." 1449 If SPEC is nil, do nothing."
1447 (let ((attrs (face-spec-choose spec frame))) 1450 (let ((attrs (face-spec-choose spec frame)))
1448 (when attrs 1451 (when spec
1449 (face-spec-reset-face face frame)) 1452 (face-spec-reset-face face frame))
1450 (while attrs 1453 (while attrs
1451 (let ((attribute (car attrs)) 1454 (let ((attribute (car attrs))
1452 (value (car (cdr attrs)))) 1455 (value (car (cdr attrs))))
1453 ;; Support some old-style attribute names and values. 1456 ;; Support some old-style attribute names and values.