From: Chong Yidong <cyd@stupidchicken.com> Date: Sun, 14 Nov 2010 19:58:24 +0000 (-0500) Subject: Repeat 2010-11-14 change to xfns.c for w32 and ns. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~243 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3e6bad42cbacf675cfd1ce71943212af85db22d;p=emacs.git 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index ce28a2bedb1..2fcda59bd78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/nsfns.m b/src/nsfns.m index 147f9aab801..0b105ab6ff1 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1224,8 +1224,6 @@ be shared by the new frame. */) "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); diff --git a/src/w32fns.c b/src/w32fns.c index 077387972fb..04358b77bf5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -4345,8 +4345,6 @@ This function is an internal primitive--use `make-frame' instead. */) "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,