2 files changed, 28 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c777d64dcc..8ee6ac43f2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2007-12-30  Richard Stallman  <rms@gnu.org>
+
+        * cus-edit.el (custom-face-set): Call `face-spec-set' with FOR-DEFFACE.
+        (custom-face-save): Likewise.
+        (custom-face-reset-saved, custom-face-reset-standard): Likewise.
+
+        * cus-face.el (custom-declare-face): Per frame, use `face-spec-set-2'.
+        (custom-theme-set-faces): Clear `face-override-spec' property.
+        Call `face-spec-set' with FOR-DEFFACE.
+
+        * custom.el (custom-theme-recalc-face):
+        Simply call `face-spec-recalc'.
+
+        * faces.el (face-spec-set): Third arg is now FOR-DEFFACE.
+        Use of frame as third arg is deprecated.
+        Handle `face-override-spec' property.
+        (face-spec-recalc): New function.
+        (face-spec-set-2): New function.
+        (frame-set-background-mode): Handle `face-override-spec' property.
+        Use `face-spec-recalc'.
+        (face-set-after-frame-default): Use `face-spec-recalc'.
+
 2007-12-29  Nick Roberts  <nickrob@snap.net.nz>
 
         * thumbs.el (thumbs-conversion-program): Add comment for Windows XP.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b9e462ec05f..e2b885c6902 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3496,10 +3496,10 @@ Optional EVENT is the location for the menu."
     (put symbol 'customized-face value)
     (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
-        (face-spec-set symbol value)
+        (face-spec-set symbol value t)
       ;; face-set-spec ignores empty attribute lists, so just give it
       ;; something harmless instead.
-      (face-spec-set symbol '((t :foreground unspecified))))
+      (face-spec-set symbol '((t :foreground unspecified)) t))
     (put symbol 'customized-face-comment comment)
     (put symbol 'face-comment comment)
     (custom-face-state-set widget)
@@ -3518,10 +3518,10 @@ Optional EVENT is the location for the menu."
       (custom-comment-hide comment-widget))
     (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
-        (face-spec-set symbol value)
+        (face-spec-set symbol value t)
       ;; face-set-spec ignores empty attribute lists, so just give it
       ;; something harmless instead.
-      (face-spec-set symbol '((t :foreground unspecified))))
+      (face-spec-set symbol '((t :foreground unspecified)) t))
     (unless (eq (widget-get widget :custom-state) 'standard)
       (put symbol 'saved-face value))
     (put symbol 'customized-face nil)
@@ -3548,7 +3548,7 @@ Optional EVENT is the location for the menu."
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
     (custom-push-theme 'theme-face symbol 'user 'set value)
-    (face-spec-set symbol value)
+    (face-spec-set symbol value t)
     (put symbol 'face-comment comment)
     (widget-value-set child value)
     ;; This call manages the comment visibility
@@ -3572,7 +3572,7 @@ restoring it to the state of a face that has never been customized."
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
     (custom-push-theme 'theme-face symbol 'user 'reset)
-    (face-spec-set symbol value)
+    (face-spec-set symbol value t)
     (custom-theme-recalc-face symbol)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)