From: tomo <tomo>
Date: Thu, 19 Sep 2002 01:13:22 +0000 (+0000)
Subject: (decode_coding_utf8): Check CCS is specified or not.
X-Git-Tag: r21-4-6-utf-2000-0_19-cr~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ae6449a411b458edb4ac720e4cc8273e0bcee19b;p=chise%2Fxemacs-chise.git.1

(decode_coding_utf8): Check CCS is specified or not.
---

diff --git a/src/text-coding.c b/src/text-coding.c
index 8f4595b..151e878 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -4351,10 +4351,17 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src,
 	  cpos = ( cpos << 6 ) | ( c & 0x3f );
 	  if (counter == 1)
 	    {
-	      Emchar char_id = decode_defined_char (ccs, cpos);
+	      Emchar char_id;
 
-	      if (char_id < 0)
-		char_id = cpos;
+	      if (!NILP (ccs))
+		{
+		  char_id = decode_defined_char (ccs, cpos);
+
+		  if (char_id < 0)
+		    char_id = cpos;
+		}
+	      else
+		ccs = char_id;
 	      COMPOSE_ADD_CHAR (str, char_id, dst);
 	      cpos = 0;
 	      counter = 0;