From a7018caf28cfca1998adae78b74f2d513da83838 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 31 Aug 2001 05:54:37 +0000 Subject: [PATCH] Sync up with r21-2-41. (COMPOSE_ADD_CHAR): Modify for interface change of `get_char_id_table'. --- src/text-coding.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/text-coding.c b/src/text-coding.c index 449152b..e9749b1 100644 --- a/src/text-coding.c +++ b/src/text-coding.c @@ -2229,7 +2229,8 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str, else if (!CHAR_ID_TABLE_P (str->combining_table)) { Lisp_Object ret - = get_char_id_table (character, Vcharacter_composition_table); + = get_char_id_table (XCHAR_ID_TABLE(Vcharacter_composition_table), + character); if (NILP (ret)) DECODE_ADD_UCS_CHAR (character, dst); @@ -2243,12 +2244,15 @@ COMPOSE_ADD_CHAR(struct decoding_stream *str, else { Lisp_Object ret - = get_char_id_table (character, str->combining_table); + = get_char_id_table (XCHAR_ID_TABLE(str->combining_table), + character); if (CHARP (ret)) { Emchar char2 = XCHARVAL (ret); - ret = get_char_id_table (char2, Vcharacter_composition_table); + ret = + get_char_id_table (XCHAR_ID_TABLE(Vcharacter_composition_table), + char2); if (NILP (ret)) { DECODE_ADD_UCS_CHAR (char2, dst); -- 1.7.10.4