Mercurial > emacs

comparison lisp/faces.el @ 83561:dc002877ce12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-674 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-675 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-676 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-677 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-678 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-679 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-680 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-681 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-682 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-683 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-684 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-685 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-686 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-687 Release ERC 5.2. * emacs@sv.gnu.org/emacs--devo--0--patch-688 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-689 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-690 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-691 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-692 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-693 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-694 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-695 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-696 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-697 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-698 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-699 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-700 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-701 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-209 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-211 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-212 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-214 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601
author Karoly Lorentey <karoly@lorentey.hu>
date Sun, 22 Apr 2007 12:42:47 +0000
parents 738ce3540ffb e3710dba6329
children cc587bfd19ca
comparison
equal deleted inserted replaced
83560:738ce3540ffb 83561:dc002877ce12
1801 ;; creation to fail. 1801 ;; creation to fail.
1802 (dolist (face (delq 'default (face-list))) 1802 (dolist (face (delq 'default (face-list)))
1803 (condition-case () 1803 (condition-case ()
1804 (progn 1804 (progn
1805 (face-spec-set face (face-user-default-spec face) frame) 1805 (face-spec-set face (face-user-default-spec face) frame)
1806 (internal-merge-in-global-face face frame)
1807 (if (memq (window-system frame) '(x w32 mac)) 1806 (if (memq (window-system frame) '(x w32 mac))
1808 (make-face-x-resource-internal face frame)) 1807 (make-face-x-resource-internal face frame))
1809 ;; If the user has customized the face, don't let X 1808 (internal-merge-in-global-face face frame))
1810 ;; resources override the customizations.
1811 (if (get face 'theme-face)
1812 (custom-theme-recalc-face face)))
1813 (error nil))) 1809 (error nil)))
1814 ;; Apply the attributes specified by frame parameters. This 1810 ;; Apply the attributes specified by frame parameters. This
1815 ;; rewrites parameters changed by make-face-x-resource-internal 1811 ;; rewrites parameters changed by make-face-x-resource-internal
1816 (dolist (param apply-params) 1812 (dolist (param apply-params)
1817 (apply 'set-face-attribute param)))) 1813 (apply 'set-face-attribute param))))