aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2008-12-30 15:09:13 +0000
committerJason Rumney2008-12-30 15:09:13 +0000
commita2227e215c9a789bfeeeb862a6ccbe55fde9a2cb (patch)
tree205e4d937bdcc3dfaf012b2f7f4468823dbf7b2a /src
parentde70fe72cdd317bab6bb0b82950ab1f205bae98a (diff)
downloademacs-a2227e215c9a789bfeeeb862a6ccbe55fde9a2cb.tar.gz
emacs-a2227e215c9a789bfeeeb862a6ccbe55fde9a2cb.zip
(store_frame_param, x_get_arg): Enable newer code on
WINDOWSNT too, as related changes have already been synced.
Diffstat (limited to 'src')
-rw-r--r--src/frame.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c
index 307e68bdb01..bff3d6d170b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2295,7 +2295,6 @@ store_frame_param (f, prop, val)
2295 swap_in_global_binding (prop); 2295 swap_in_global_binding (prop);
2296 } 2296 }
2297 2297
2298#ifndef WINDOWSNT
2299 /* The tty color needed to be set before the frame's parameter 2298 /* The tty color needed to be set before the frame's parameter
2300 alist was updated with the new value. This is not true any more, 2299 alist was updated with the new value. This is not true any more,
2301 but we still do this test early on. */ 2300 but we still do this test early on. */
@@ -2303,7 +2302,6 @@ store_frame_param (f, prop, val)
2303 && f == FRAME_TTY (f)->previous_frame) 2302 && f == FRAME_TTY (f)->previous_frame)
2304 /* Force redisplay of this tty. */ 2303 /* Force redisplay of this tty. */
2305 FRAME_TTY (f)->previous_frame = NULL; 2304 FRAME_TTY (f)->previous_frame = NULL;
2306#endif
2307 2305
2308 /* Update the frame parameter alist. */ 2306 /* Update the frame parameter alist. */
2309 old_alist_elt = Fassq (prop, f->param_alist); 2307 old_alist_elt = Fassq (prop, f->param_alist);
@@ -3933,7 +3931,6 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
3933 { 3931 {
3934 /* If we find this parm in ALIST, clear it out 3932 /* If we find this parm in ALIST, clear it out
3935 so that it won't be "left over" at the end. */ 3933 so that it won't be "left over" at the end. */
3936#ifndef WINDOWSNT /* w32fns.c has not yet been changed to cope with this. */
3937 Lisp_Object tail; 3934 Lisp_Object tail;
3938 XSETCAR (tem, Qnil); 3935 XSETCAR (tem, Qnil);
3939 /* In case the parameter appears more than once in the alist, 3936 /* In case the parameter appears more than once in the alist,
@@ -3942,7 +3939,6 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
3942 if (CONSP (XCAR (tail)) 3939 if (CONSP (XCAR (tail))
3943 && EQ (XCAR (XCAR (tail)), param)) 3940 && EQ (XCAR (XCAR (tail)), param))
3944 XSETCAR (XCAR (tail), Qnil); 3941 XSETCAR (XCAR (tail), Qnil);
3945#endif
3946 } 3942 }
3947 else 3943 else
3948 tem = Fassq (param, Vdefault_frame_alist); 3944 tem = Fassq (param, Vdefault_frame_alist);