From: tomo <tomo>
Date: Mon, 22 May 2000 11:31:05 +0000 (+0000)
Subject: (COMPOSE_ADD_CHAR): Use `CHAR_ID_TABLE_P' and `get_char_id_table'
X-Git-Tag: r21-2-33-utf-2000-0_15-1~13
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9862672a2190f67b71373686933290ac2d4598;p=chise%2Fxemacs-chise.git

(COMPOSE_ADD_CHAR): Use `CHAR_ID_TABLE_P' and `get_char_id_table'
instead of `CHAR_CODE_TABLE_P' and `get_char_code_table'.
---

diff --git a/src/text-coding.c b/src/text-coding.c
index 69702ba..7dac5de 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -2219,10 +2219,10 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str,
 {
   if (CODING_SYSTEM_DISABLE_COMPOSITION (str->codesys))
     DECODE_ADD_UCS_CHAR (character, dst);
-  else if (!CHAR_CODE_TABLE_P (str->combining_table))
+  else if (!CHAR_ID_TABLE_P (str->combining_table))
     {
       Lisp_Object ret
-	= get_char_code_table (character, Vcharacter_composition_table);
+	= get_char_id_table (character, Vcharacter_composition_table);
 
       if (NILP (ret))
 	DECODE_ADD_UCS_CHAR (character, dst);
@@ -2236,12 +2236,12 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str,
   else
     {
       Lisp_Object ret
-	= get_char_code_table (character, str->combining_table);
+	= get_char_id_table (character, str->combining_table);
 
       if (CHARP (ret))
 	{
 	  Emchar char2 = XCHARVAL (ret);
-	  ret = get_char_code_table (char2, Vcharacter_composition_table);
+	  ret = get_char_id_table (char2, Vcharacter_composition_table);
 	  if (NILP (ret))
 	    {
 	      DECODE_ADD_UCS_CHAR (char2, dst);
@@ -2255,7 +2255,7 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str,
 	      str->combining_table = ret;
 	    }
 	}
-      else if (CHAR_CODE_TABLE_P (ret))
+      else if (CHAR_ID_TABLE_P (ret))
 	{
 	  str->combined_chars[str->combined_char_count++] = character;
 	  str->combining_table = ret;