diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2007-03-25 18:58:06 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2007-03-25 18:58:06 +0000 |
| commit | 6aa2269da5e4cde468efa3ba000ecd71712102e5 (patch) | |
| tree | 6d547acdf2d592be5612936e3233f2b29264795b /lisp/faces.el | |
| parent | 17927b3941f5a0cc6b3d65a95a13e258a23a37d0 (diff) | |
| download | emacs-6aa2269da5e4cde468efa3ba000ecd71712102e5.tar.gz | |
(face-set-after-frame-default): Revert 2007-03-10 change. Merge in X
resources before global face.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 6 |
1 files changed, 1 insertions, 5 deletions
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 |