Merge fix for Bug#4238 from trunk

2 files changed, 8 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 84280a9a90f..09a6180e79d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.c (Fmodify_frame_parameters): In tty case, update the
+        default face if necessary (Bug#4238).
+
 2011-07-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress
diff --git a/src/frame.c b/src/frame.c
index f1cc0ce019d..a568342966a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2606,11 +2606,9 @@ use is not recommended.  Explicitly check for a frame-parameter instead.  */)
           val = values[i];
           store_frame_param (f, prop, val);
 
-          /* Changing the background color might change the background
-             mode, so that we have to load new defface specs.
-             Call frame-set-background-mode to do that.  */
-          if (EQ (prop, Qbackground_color))
-            call1 (Qframe_set_background_mode, frame);
+          if (EQ (prop, Qforeground_color)
+              || EQ (prop, Qbackground_color))
+            update_face_from_frame_parameter (f, prop, val);
         }
     }
   return Qnil;