[Emacs-diffs] Changes to emacs/lisp/faces.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/03/10 22:28:51

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- faces.el    4 Mar 2007 17:44:42 -0000       1.367
+++ faces.el    10 Mar 2007 22:28:51 -0000      1.368
@@ -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