aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c8
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 @@
12011-07-22 Chong Yidong <cyd@stupidchicken.com>
2
3 * frame.c (Fmodify_frame_parameters): In tty case, update the
4 default face if necessary (Bug#4238).
5
12011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 62011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 7
3 * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress 8 * 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. */)
2606 val = values[i]; 2606 val = values[i];
2607 store_frame_param (f, prop, val); 2607 store_frame_param (f, prop, val);
2608 2608
2609 /* Changing the background color might change the background 2609 if (EQ (prop, Qforeground_color)
2610 mode, so that we have to load new defface specs. 2610 || EQ (prop, Qbackground_color))
2611 Call frame-set-background-mode to do that. */ 2611 update_face_from_frame_parameter (f, prop, val);
2612 if (EQ (prop, Qbackground_color))
2613 call1 (Qframe_set_background_mode, frame);
2614 } 2612 }
2615 } 2613 }
2616 return Qnil; 2614 return Qnil;