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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/03/25 18:58:07

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -b -r1.369 -r1.370
--- faces.el    19 Mar 2007 18:41:12 -0000      1.369
+++ faces.el    25 Mar 2007 18:58:06 -0000      1.370
@@ -1789,13 +1789,9 @@
       (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