[Emacs-diffs] /srv/bzr/emacs/trunk r102388: Repeat 2010-11-14 change to xfns.c for w32 and ns.

[Chong Yidong]

------------------------------------------------------------
revno: 102388
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-14 14:58:24 -0500
message:
  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.
modified:
  src/ChangeLog
  src/nsfns.m
  src/w32fns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-14 10:21:16 +0000
+++ b/src/ChangeLog     2010-11-14 19:58:24 +0000
@@ -1,3 +1,9 @@
+2010-11-14  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xterm.c (set_wm_state): Add Qnil to final cons.

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2010-10-29 07:04:09 +0000
+++ b/src/nsfns.m       2010-11-14 19:58:24 +0000
@@ -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);

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2010-11-14 06:55:27 +0000
+++ b/src/w32fns.c      2010-11-14 19:58:24 +0000
@@ -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,