From 6aa2269da5e4cde468efa3ba000ecd71712102e5 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 25 Mar 2007 18:58:06 +0000 Subject: (face-set-after-frame-default): Revert 2007-03-10 change. Merge in X resources before global face. --- lisp/faces.el | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lisp/faces.el') diff --git a/lisp/faces.el b/lisp/faces.el index 16598c2d581..a8c92ab9a75 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1789,13 +1789,9 @@ Initialize colors of certain faces from frame parameters." (condition-case () (progn (face-spec-set face (face-user-default-spec face) frame) - (internal-merge-in-global-face face frame) (if (memq window-system '(x w32 mac)) (make-face-x-resource-internal face frame)) - ;; If the user has customized the face, don't let X - ;; resources override the customizations. - (if (get face 'theme-face) - (custom-theme-recalc-face face))) + (internal-merge-in-global-face face frame)) (error nil))) ;; Apply the attributes specified by frame parameters. This ;; rewrites parameters changed by make-face-x-resource-internal -- cgit v1.2.1