1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

Merge fix for Bug#4238 from trunk

This commit is contained in:
Chong Yidong 2011-07-22 11:23:10 -04:00
parent 17c87e18e5
commit f7912160c4
2 changed files with 8 additions and 5 deletions

View File

@ -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

View File

@ -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;