# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 910313056 0
# Node ID 9e74943ac4181b2a587ace1b96329952785356fd
# Parent  06e64578176283d599213480381fb5d0b5ec8b3f
(string_to_non_ascii_char): Fix previous change.

diff -r 06e645781762 -r 9e74943ac418 src/charset.c
--- a/src/charset.c	Fri Nov 06 00:44:16 1998 +0000
+++ b/src/charset.c	Fri Nov 06 00:44:16 1998 +0000
@@ -217,12 +217,13 @@
 	  int char_bytes = BYTES_BY_CHAR_HEAD (c);
 
 	  str++;
-	  if (c >= LEADING_CODE_PRIVATE_11)
+	  if (c >= LEADING_CODE_PRIVATE_11 && c <= LEADING_CODE_PRIVATE_22)
 	    charset = *str++;
-	  if (CHARSET_DEFINED_P (charset) && char_bytes <= bytes)
+	  if (char_bytes <= bytes)
 	    {
 	      c1 = *str++ & 0x7f;
-	      if (CHARSET_DIMENSION (charset) == 2)
+	      if (CHARSET_DEFINED_P (charset)
+		  && CHARSET_DIMENSION (charset) == 2)
 		c2 = *str & 0x7F;
 	      c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
 	      if (exclude_tail_garbage)