martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(face-set-after-frame-default): Recalculate face customizations after

Browse Source 
applying X resources.
This commit is contained in:
Chong Yidong
2007-03-10 22:28:51 +00:00
parent 0e160a95e2
commit 87a0fbbe39
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/faces.el
View File

@@ -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