diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-07-22 11:23:10 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-07-22 11:23:10 -0400 |
| commit | f7912160c498869e56edc5472b94106fd772fb8d (patch) | |
| tree | 7ac8b67700fe9d4e5f2a1961dfb06ca7f4b5edf2 | |
| parent | 17c87e18e5410b7077757f9852a2bb0e0cde54c6 (diff) | |
| download | emacs-f7912160c498869e56edc5472b94106fd772fb8d.tar.gz | |
Merge fix for Bug#4238 from trunk
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 8 |
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; |