Mercurial > emacs
changeset 111541:ca0d9a916432
Repeat 2010-11-14 change to xfns.c for w32 and ns.
* w32fns.c (Fx_create_frame):
* nsfns.m (Fx_create_frame): Don't check for the cursorColor
resource here; it's now done at startup.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 14 Nov 2010 14:58:24 -0500 |
| parents | ca297dbe1d56 |
| children | a62d0a8c179e |
| files | src/ChangeLog src/nsfns.m src/w32fns.c |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 14 11:21:16 2010 +0100 +++ b/src/ChangeLog Sun Nov 14 14:58:24 2010 -0500 @@ -1,3 +1,9 @@ +2010-11-14 Chong Yidong <cyd@stupidchicken.com> + + * w32fns.c (Fx_create_frame): + * nsfns.m (Fx_create_frame): Don't check for the cursorColor + resource here; it's now done at startup. + 2010-11-14 Jan Djärv <jan.h.d@swipnet.se> * xterm.c (set_wm_state): Add Qnil to final cons.
--- a/src/nsfns.m Sun Nov 14 11:21:16 2010 +0100 +++ b/src/nsfns.m Sun Nov 14 14:58:24 2010 -0500 @@ -1224,8 +1224,6 @@ "foreground", "Foreground", RES_TYPE_STRING); x_default_parameter (f, parms, Qbackground_color, build_string ("White"), "background", "Background", RES_TYPE_STRING); - x_default_parameter (f, parms, Qcursor_color, build_string ("grey"), - "cursorColor", "CursorColor", RES_TYPE_STRING); /* FIXME: not suppported yet in Nextstep */ x_default_parameter (f, parms, Qline_spacing, Qnil, "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
--- a/src/w32fns.c Sun Nov 14 11:21:16 2010 +0100 +++ b/src/w32fns.c Sun Nov 14 14:58:24 2010 -0500 @@ -4345,8 +4345,6 @@ "background", "Background", RES_TYPE_STRING); x_default_parameter (f, parameters, Qmouse_color, build_string ("black"), "pointerColor", "Foreground", RES_TYPE_STRING); - x_default_parameter (f, parameters, Qcursor_color, build_string ("black"), - "cursorColor", "Foreground", RES_TYPE_STRING); x_default_parameter (f, parameters, Qborder_color, build_string ("black"), "borderColor", "BorderColor", RES_TYPE_STRING); x_default_parameter (f, parameters, Qscreen_gamma, Qnil,