comparison src/charset.c @ 20188:d4ad4463384d

(Fchars_in_string): Pay attention to enable-multibyte-characters. (Fchars_in_region): Likewise. Avoid error when the region ends in the middle of a multibyte character.

20187:0ee26e03e911

  unsigned char *p, *endp;
  int chars;

  CHECK_STRING (str, 0);

  p = XSTRING (str)->data; endp = p + XSTRING (str)->size;
  chars = 0;
  while (p < endp)
    {
      if (*p == LEADING_CODE_COMPOSITION)

  from = min (XFASTINT (beg), XFASTINT (end));
  to = max (XFASTINT (beg), XFASTINT (end));
  p = POS_ADDR (from);

  if (from < GPT && GPT <= to)
    {
      stop = GPT;
      endp = GPT_ADDR;
    }

      endp = POS_ADDR (stop);
    }

  while (1)
    {
      if (p == endp)
	{
	  if (stop == to)
	    break;

	  p = POS_ADDR (stop);
	  stop = to;
	  endp = POS_ADDR (stop);

20188:d4ad4463384d

  unsigned char *p, *endp;
  int chars;

  CHECK_STRING (str, 0);

  if (NILP (current_buffer->enable_multibyte_characters))
    return make_number (XSTRING (str)->size);

  p = XSTRING (str)->data; endp = p + XSTRING (str)->size;
  chars = 0;
  while (p < endp)
    {
      if (*p == LEADING_CODE_COMPOSITION)

  from = min (XFASTINT (beg), XFASTINT (end));
  to = max (XFASTINT (beg), XFASTINT (end));
  p = POS_ADDR (from);

  if (NILP (current_buffer->enable_multibyte_characters))
    return make_number (to - from);

  if (from < GPT && GPT <= to)
    {
      stop = GPT;
      endp = GPT_ADDR;
    }

      endp = POS_ADDR (stop);
    }

  while (1)
    {
      if (p >= endp)
	{
	  if (stop >= to)
	    break;

	  p = POS_ADDR (stop);
	  stop = to;
	  endp = POS_ADDR (stop);