comparison src/xfns.c @ 3203:1055aa1b7547

* xfns.c (x_set_frame_parameters): Use the first position/size parameter we find, not the last.

3202:dda1a74daff6

     entire list before we set them.  */
  Lisp_Object width, height;

  /* Same here.  */
  Lisp_Object left, top;
  
  XSET (width,  Lisp_Int, FRAME_WIDTH  (f));
  XSET (height, Lisp_Int, FRAME_HEIGHT (f));

  XSET (top, Lisp_Int, f->display.x->top_pos);
  XSET (left, Lisp_Int, f->display.x->left_pos);

  for (tail = alist; CONSP (tail); tail = Fcdr (tail))
    {
      Lisp_Object elt, prop, val;

      elt = Fcar (tail);
      prop = Fcar (elt);
      val = Fcdr (elt);

      if (EQ (prop, Qwidth))
	width = val;
      else if (EQ (prop, Qheight))
	height = val;
      else if (EQ (prop, Qtop))
	top = val;
      else if (EQ (prop, Qleft))
	left = val;
      else
	{
	  register Lisp_Object param_index = Fget (prop, Qx_frame_parameter);
	  register Lisp_Object old_value = get_frame_param (f, prop);

  /* Don't call these unless they've changed; the window may not actually
     exist yet.  */
  {
    Lisp_Object frame;

    XSET (frame, Lisp_Frame, f);
    if (XINT (width) != FRAME_WIDTH (f)
	|| XINT (height) != FRAME_HEIGHT (f))
      Fset_frame_size (frame, width, height);

3203:1055aa1b7547

     entire list before we set them.  */
  Lisp_Object width, height;

  /* Same here.  */
  Lisp_Object left, top;

  width = height = top = left = Qnil;

  for (tail = alist; CONSP (tail); tail = Fcdr (tail))
    {
      Lisp_Object elt, prop, val;

      elt = Fcar (tail);
      prop = Fcar (elt);
      val = Fcdr (elt);

      /* Ignore all but the first set presented.  You're supposed to
	 be able to append two parameter lists and have the first
	 shadow the second.  */
      if (EQ (prop, Qwidth) && NILP (width))
	width = val;
      else if (EQ (prop, Qheight) && NILP (height))
	height = val;
      else if (EQ (prop, Qtop) && NILP (top))
	top = val;
      else if (EQ (prop, Qleft) && NILP (left))
	left = val;
      else
	{
	  register Lisp_Object param_index = Fget (prop, Qx_frame_parameter);
	  register Lisp_Object old_value = get_frame_param (f, prop);

  /* Don't call these unless they've changed; the window may not actually
     exist yet.  */
  {
    Lisp_Object frame;

    if (NILP (width))  XSET (width,  Lisp_Int, FRAME_WIDTH  (f));
    if (NILP (height)) XSET (height, Lisp_Int, FRAME_HEIGHT (f));

    if (NILP (top))    XSET (top, Lisp_Int, f->display.x->top_pos);
    if (NILP (left))   XSET (left, Lisp_Int, f->display.x->left_pos);

    XSET (frame, Lisp_Frame, f);
    if (XINT (width) != FRAME_WIDTH (f)
	|| XINT (height) != FRAME_HEIGHT (f))
      Fset_frame_size (frame, width, height);