comparison src/xfaces.c @ 40838:bf08eafda9a3

(merge_face_vectors): Use braces to follow GNU Coding Standards. (Finternal_set_lisp_face_attribute): Likewise.

40837:49b732d9bf27

	  || !UNSPECIFIEDP (from[LFACE_AVGWIDTH_INDEX])))
    to[LFACE_FONT_INDEX] = Qnil;

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
      else
	to[i] = from[i];

  /* TO is always an absolute face, which should inherit from nothing.
     We blindly copy the :inherit attribute above and fix it up here.  */
  to[LFACE_INHERIT_INDEX] = Qnil;
}

	  else
	    menu_face_changed_default = 1;
	}

      if (!NILP (param))
	if (EQ (frame, Qt))
	  /* Update `default-frame-alist', which is used for new frames.  */
	  {
	    store_in_alist (&Vdefault_frame_alist, param, value);
	  }
	else
	  /* Update the current frame's parameters.  */
	  {
	    Lisp_Object cons;
	    cons = XCAR (Vparam_value_alist);
	    XSETCAR (cons, param);
	    XSETCDR (cons, value);
	    Fmodify_frame_parameters (frame, Vparam_value_alist);
	  }
    }

  return face;
}

40838:bf08eafda9a3

	  || !UNSPECIFIEDP (from[LFACE_AVGWIDTH_INDEX])))
    to[LFACE_FONT_INDEX] = Qnil;

  for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
    if (!UNSPECIFIEDP (from[i]))
      {
	if (i == LFACE_HEIGHT_INDEX && !INTEGERP (from[i]))
	  to[i] = merge_face_heights (from[i], to[i], to[i], cycle_check);
	else
	  to[i] = from[i];
      }

  /* TO is always an absolute face, which should inherit from nothing.
     We blindly copy the :inherit attribute above and fix it up here.  */
  to[LFACE_INHERIT_INDEX] = Qnil;
}

	  else
	    menu_face_changed_default = 1;
	}

      if (!NILP (param))
	{
	  if (EQ (frame, Qt))
	    /* Update `default-frame-alist', which is used for new frames.  */
	    {
	      store_in_alist (&Vdefault_frame_alist, param, value);
	    }
	  else
	    /* Update the current frame's parameters.  */
	    {
	      Lisp_Object cons;
	      cons = XCAR (Vparam_value_alist);
	      XSETCAR (cons, param);
	      XSETCDR (cons, value);
	      Fmodify_frame_parameters (frame, Vparam_value_alist);
	    }
	}
    }

  return face;
}