comparison src/composite.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).

40655:45453187feeb

  validate_region (&start, &end);
  if (!NILP (components)
      && !INTEGERP (components)
      && !CONSP (components)
      && !STRINGP (components))
    CHECK_VECTOR (components, 2);

  compose_text (XINT (start), XINT (end), components, mod_func, Qnil);
  return Qnil;
}

Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC\n\
for the composition.   See `compose-string' for more detial.")
  (string, start, end, components, mod_func)
     Lisp_Object string, start, end, components, mod_func;
{
  CHECK_STRING (string, 0);
  CHECK_NUMBER (start, 1);
  CHECK_NUMBER (end, 2);

  if (XINT (start) < 0 ||
      XINT (start) > XINT (end)
      || XINT (end) > XSTRING (string)->size)
    args_out_of_range (start, end);

{
  Lisp_Object prop, tail;
  int start, end;
  int id;

  CHECK_NUMBER_COERCE_MARKER (pos, 0);
  start = XINT (pos);
  if (!NILP (limit))
    {
      CHECK_NUMBER_COERCE_MARKER (limit, 1);
      end = XINT (limit);
    }
  else
    end = -1;
  
  if (!NILP (string))
    {
      CHECK_STRING (string, 2);
      if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
	args_out_of_range (string, pos);
    }
  else
    {

40656:cdfd4d09b79a

  validate_region (&start, &end);
  if (!NILP (components)
      && !INTEGERP (components)
      && !CONSP (components)
      && !STRINGP (components))
    CHECK_VECTOR (components);

  compose_text (XINT (start), XINT (end), components, mod_func, Qnil);
  return Qnil;
}

Optional 4th and 5th arguments are COMPONENTS and MODIFICATION-FUNC\n\
for the composition.   See `compose-string' for more detial.")
  (string, start, end, components, mod_func)
     Lisp_Object string, start, end, components, mod_func;
{
  CHECK_STRING (string);
  CHECK_NUMBER (start);
  CHECK_NUMBER (end);

  if (XINT (start) < 0 ||
      XINT (start) > XINT (end)
      || XINT (end) > XSTRING (string)->size)
    args_out_of_range (start, end);

{
  Lisp_Object prop, tail;
  int start, end;
  int id;

  CHECK_NUMBER_COERCE_MARKER (pos);
  start = XINT (pos);
  if (!NILP (limit))
    {
      CHECK_NUMBER_COERCE_MARKER (limit);
      end = XINT (limit);
    }
  else
    end = -1;
  
  if (!NILP (string))
    {
      CHECK_STRING (string);
      if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
	args_out_of_range (string, pos);
    }
  else
    {