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 ce28a2bedb1b15fb452683c62f869ff89fd6bcb7..2fcda59bd78d058932b3145059a213b483bd3542 100644 (file)
--- 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 147f9aab801f2a6a1e4f0570748f8e1ce954ab49..0b105ab6ff14a5f63e2d147b074f226f79684aa4 100644 (file)
--- 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 077387972fb721e2036479c914de260ba8c0cd0b..04358b77bf51bb402e07fd19f92d96d095511b22 100644 (file)
--- 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,