# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 910595171 0
# Node ID 53553d8b253e22788339efdfbdcff68d64a51b41
# Parent  bf72d6351f292e60a632abc27c70286355943df1
(string_to_non_ascii_char): Return correct length for
a charset of dimension 2 and composition character.

diff -r bf72d6351f29 -r 53553d8b253e src/charset.c
--- a/src/charset.c	Sun Nov 08 17:24:16 1998 +0000
+++ b/src/charset.c	Mon Nov 09 07:06:11 1998 +0000
@@ -208,8 +208,10 @@
 	  if (cmpchar_id >= 0)
 	    {
 	      c = MAKE_COMPOSITE_CHAR (cmpchar_id);
-	      str += cmpchar_table[cmpchar_id]->len;
+	      str += cmpchar_table[cmpchar_id]->len - 1;
 	    }
+	  else
+	    str += bytes - 1;
 	}
       else
 	{
@@ -230,7 +232,7 @@
 	  if (CHARSET_DEFINED_P (charset)
 	      && CHARSET_DIMENSION (charset) == 2
 	      && str < endp)
-	    c2 = *str & 0x7F;
+	    c2 = *str++ & 0x7F;
 	  c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
 	}
     } while (0);