comparison src/charset.c @ 23649:9e74943ac418

(string_to_non_ascii_char): Fix previous change.

23648:06e645781762

	{
	  int charset = c, c1, c2 = 0;
	  int char_bytes = BYTES_BY_CHAR_HEAD (c);

	  str++;
	  if (c >= LEADING_CODE_PRIVATE_11)
	    charset = *str++;
	  if (CHARSET_DEFINED_P (charset) && char_bytes <= bytes)
	    {
	      c1 = *str++ & 0x7f;
	      if (CHARSET_DIMENSION (charset) == 2)
		c2 = *str & 0x7F;
	      c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
	      if (exclude_tail_garbage)
		bytes = char_bytes;
	    }

23649:9e74943ac418

	{
	  int charset = c, c1, c2 = 0;
	  int char_bytes = BYTES_BY_CHAR_HEAD (c);

	  str++;
	  if (c >= LEADING_CODE_PRIVATE_11 && c <= LEADING_CODE_PRIVATE_22)
	    charset = *str++;
	  if (char_bytes <= bytes)
	    {
	      c1 = *str++ & 0x7f;
	      if (CHARSET_DEFINED_P (charset)
		  && CHARSET_DIMENSION (charset) == 2)
		c2 = *str & 0x7F;
	      c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
	      if (exclude_tail_garbage)
		bytes = char_bytes;
	    }