[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100614: Merge fix for Bug#4238 from trunk

[Chong Yidong]

------------------------------------------------------------
revno: 100614 [merge]
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-07-22 11:23:43 -0400
message:
  Merge fix for Bug#4238 from trunk
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-11 23:07:49 +0000
+++ b/src/ChangeLog     2011-07-22 15:23:10 +0000
@@ -1,3 +1,8 @@
+2011-07-22  Chong Yidong  <address@hidden>
+
+       * frame.c (Fmodify_frame_parameters): In tty case, update the
+       default face if necessary (Bug#4238).
+
 2011-07-11  YAMAMOTO Mitsuharu  <address@hidden>
 
        * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-01-02 23:50:46 +0000
+++ b/src/frame.c       2011-07-22 15:23:10 +0000
@@ -2606,11 +2606,9 @@
          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;