From: tomo <tomo>
Date: Mon, 3 Sep 2001 09:32:36 +0000 (+0000)
Subject: (COMPOSE_ADD_CHAR): Use `XCHAR_TABLE' instead of `XCHAR_ID_TABLE'.
X-Git-Tag: r21-2-41-chartab-2~15
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e6f82b2a39180920514b43a2ef79f9d1a6ffa1f0;p=chise%2Fxemacs-chise.git

(COMPOSE_ADD_CHAR): Use `XCHAR_TABLE' instead of `XCHAR_ID_TABLE'.
---

diff --git a/src/text-coding.c b/src/text-coding.c
index e9749b1..509cbb9 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -2229,7 +2229,7 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str,
   else if (!CHAR_ID_TABLE_P (str->combining_table))
     {
       Lisp_Object ret
-	= get_char_id_table (XCHAR_ID_TABLE(Vcharacter_composition_table),
+	= get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
 			     character);
 
       if (NILP (ret))
@@ -2244,14 +2244,14 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str,
   else
     {
       Lisp_Object ret
-	= get_char_id_table (XCHAR_ID_TABLE(str->combining_table),
+	= get_char_id_table (XCHAR_TABLE(str->combining_table),
 			     character);
 
       if (CHARP (ret))
 	{
 	  Emchar char2 = XCHARVAL (ret);
 	  ret =
-	    get_char_id_table (XCHAR_ID_TABLE(Vcharacter_composition_table),
+	    get_char_id_table (XCHAR_TABLE(Vcharacter_composition_table),
 			       char2);
 	  if (NILP (ret))
 	    {