aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-11-14 14:58:24 -0500
committerChong Yidong2010-11-14 14:58:24 -0500
commita3e6bad42cbacf675cfd1ce71943212af85db22d (patch)
treedbc15b116ec27f97606407ae447e4b6da901e605 /src
parent5a232ffb73021c9c00dcfd959da43b6425f67cd7 (diff)
downloademacs-a3e6bad42cbacf675cfd1ce71943212af85db22d.tar.gz
emacs-a3e6bad42cbacf675cfd1ce71943212af85db22d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/nsfns.m2
-rw-r--r--src/w32fns.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ce28a2bedb1..2fcda59bd78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12010-11-14 Chong Yidong <cyd@stupidchicken.com>
2
3 * w32fns.c (Fx_create_frame):
4 * nsfns.m (Fx_create_frame): Don't check for the cursorColor
5 resource here; it's now done at startup.
6
12010-11-14 Jan Djärv <jan.h.d@swipnet.se> 72010-11-14 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * xterm.c (set_wm_state): Add Qnil to final cons. 9 * 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. */)
1224 "foreground", "Foreground", RES_TYPE_STRING); 1224 "foreground", "Foreground", RES_TYPE_STRING);
1225 x_default_parameter (f, parms, Qbackground_color, build_string ("White"), 1225 x_default_parameter (f, parms, Qbackground_color, build_string ("White"),
1226 "background", "Background", RES_TYPE_STRING); 1226 "background", "Background", RES_TYPE_STRING);
1227 x_default_parameter (f, parms, Qcursor_color, build_string ("grey"),
1228 "cursorColor", "CursorColor", RES_TYPE_STRING);
1229 /* FIXME: not suppported yet in Nextstep */ 1227 /* FIXME: not suppported yet in Nextstep */
1230 x_default_parameter (f, parms, Qline_spacing, Qnil, 1228 x_default_parameter (f, parms, Qline_spacing, Qnil,
1231 "lineSpacing", "LineSpacing", RES_TYPE_NUMBER); 1229 "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. */)
4345 "background", "Background", RES_TYPE_STRING); 4345 "background", "Background", RES_TYPE_STRING);
4346 x_default_parameter (f, parameters, Qmouse_color, build_string ("black"), 4346 x_default_parameter (f, parameters, Qmouse_color, build_string ("black"),
4347 "pointerColor", "Foreground", RES_TYPE_STRING); 4347 "pointerColor", "Foreground", RES_TYPE_STRING);
4348 x_default_parameter (f, parameters, Qcursor_color, build_string ("black"),
4349 "cursorColor", "Foreground", RES_TYPE_STRING);
4350 x_default_parameter (f, parameters, Qborder_color, build_string ("black"), 4348 x_default_parameter (f, parameters, Qborder_color, build_string ("black"),
4351 "borderColor", "BorderColor", RES_TYPE_STRING); 4349 "borderColor", "BorderColor", RES_TYPE_STRING);
4352 x_default_parameter (f, parameters, Qscreen_gamma, Qnil, 4350 x_default_parameter (f, parameters, Qscreen_gamma, Qnil,