Mercurial > emacs
changeset 76447:6da62180836c
(face-set-after-frame-default): Recalculate face customizations after
applying X resources.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 10 Mar 2007 22:28:51 +0000 |
| parents | 622e7c78002b |
| children | 027e2cfa6a71 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Sat Mar 10 22:28:41 2007 +0000 +++ b/lisp/faces.el Sat Mar 10 22:28:51 2007 +0000 @@ -1791,7 +1791,11 @@ (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