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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/06/10 19:56:42

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- faces.el    22 May 2008 02:34:17 -0000      1.404
+++ faces.el    10 Jun 2008 19:56:42 -0000      1.405
@@ -1506,8 +1506,9 @@
 then the override spec."
   (face-spec-reset-face face frame)
   (let ((face-sym (or (get face 'face-alias) face)))
-    (face-spec-set-2 face frame
-                    (face-user-default-spec face))
+    (or (get face 'customized-face)
+       (get face 'saved-face)
+       (face-spec-set-2 face frame (face-default-spec face)))
     (let ((theme-faces (reverse (get face-sym 'theme-face))))
       (dolist (spec theme-faces)
        (face-spec-set-2 face frame (cadr spec))))