# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1289764704 18000
# Node ID ca0d9a916432cab92de3d2bc5a29def1d70424f7
# Parent  ca297dbe1d56d786af85a723e0b08ada9726467a
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 -r ca297dbe1d56 -r ca0d9a916432 src/ChangeLog
--- 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.
diff -r ca297dbe1d56 -r ca0d9a916432 src/nsfns.m
--- 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);
diff -r ca297dbe1d56 -r ca0d9a916432 src/w32fns.c
--- 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,