From 87a0fbbe39f03a8078705db8654bca4a57a0664e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 10 Mar 2007 22:28:51 +0000 Subject: [PATCH] (face-set-after-frame-default): Recalculate face customizations after applying X resources. --- lisp/faces.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/faces.el b/lisp/faces.el index 8e93b9a4f3a..dd5de86f8ea 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1791,7 +1791,11 @@ Initialize colors of certain faces from frame parameters." (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))) + (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))) (error nil))) ;; Apply the attributes specified by frame parameters. This ;; rewrites parameters changed by make-face-x-resource-internal -- 2.39.2