Fix how custom themes handle faces, so the multi-tty/multi-frame case works.

* lisp/custom.el (custom-push-theme): Don't record faces in `changed'
theme; this doesn't work correctly for per-frame face settings.
(disable-theme): Use face-set-after-frame-default to reset faces.
(custom--frame-color-default): New function.

* lisp/frame.el (frame-background-mode, frame-set-background-mode):
Moved from faces.el.
(frame-default-terminal-background): New function.

* src/xfaces.c (Finternal_merge_in_global_face): Modify the foreground
and background color parameters if they have been changed.

2 files changed, 17 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ad5b9c41c30..b77759527e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfaces.c (Finternal_merge_in_global_face): Modify the foreground
+        and background color parameters if they have been changed.
+
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * editfns.c (Fformat): Clarify the - and 0 flags (bug#6659).
diff --git a/src/xfaces.c b/src/xfaces.c
index 4f06bd3ba55..91f4b133466 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3813,6 +3813,18 @@ Default face attributes override any local face attributes.  */)
               Fmodify_frame_parameters (frame, Fcons (Fcons (Qfont, name),
                                                       Qnil));
             }
+
+          if (STRINGP (gvec[LFACE_FOREGROUND_INDEX]))
+            Fmodify_frame_parameters (frame,
+                                      Fcons (Fcons (Qforeground_color,
+                                                    gvec[LFACE_FOREGROUND_INDEX]),
+                                             Qnil));
+
+          if (STRINGP (gvec[LFACE_BACKGROUND_INDEX]))
+            Fmodify_frame_parameters (frame,
+                                      Fcons (Fcons (Qbackground_color,
+                                                    gvec[LFACE_BACKGROUND_INDEX]),
+                                             Qnil));
         }
     }