From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 30 Dec 2008 15:09:13 +0000 (+0000)
Subject: (store_frame_param, x_get_arg): Enable newer code on
X-Git-Tag: emacs-pretest-23.0.90~802
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2227e215c9a789bfeeeb862a6ccbe55fde9a2cb;p=emacs.git

(store_frame_param, x_get_arg): Enable newer code on
WINDOWSNT too, as related changes have already been synced.
---

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)
  	swap_in_global_binding (prop);
     }
 
-#ifndef WINDOWSNT
   /* The tty color needed to be set before the frame's parameter
      alist was updated with the new value.  This is not true any more,
      but we still do this test early on.  */
@@ -2303,7 +2302,6 @@ store_frame_param (f, prop, val)
       && f == FRAME_TTY (f)->previous_frame)
     /* Force redisplay of this tty.  */
     FRAME_TTY (f)->previous_frame = NULL;
-#endif
 
   /* Update the frame parameter alist.  */
   old_alist_elt = Fassq (prop, f->param_alist);
@@ -3933,7 +3931,6 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
     {
       /* If we find this parm in ALIST, clear it out
 	 so that it won't be "left over" at the end.  */
-#ifndef WINDOWSNT /* w32fns.c has not yet been changed to cope with this.  */
       Lisp_Object tail;
       XSETCAR (tem, Qnil);
       /* In case the parameter appears more than once in the alist,
@@ -3942,7 +3939,6 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
 	if (CONSP (XCAR (tail))
 	    && EQ (XCAR (XCAR (tail)), param))
 	  XSETCAR (XCAR (tail), Qnil);
-#endif
     }
   else
     tem = Fassq (param, Vdefault_frame_alist);