From: tomo Date: Wed, 12 Nov 2003 14:49:09 +0000 (+0000) Subject: (decode_add_er_char): Modify for `DECODE_CHAR'. X-Git-Tag: r21-4-14-chise-0_21-4^2~9 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c72f99015d8e9b79cc4088ebdf6c90af0ad8b797;p=chise%2Fxemacs-chise.git- (decode_add_er_char): Modify for `DECODE_CHAR'. (char_encode_as_entity_reference): Likewise. (decode_coding_big5): Modify for `decode_defined_char' and `DECODE_CHAR'. (decode_coding_utf8): Modify for `decode_defined_char'; modify to avoid compiler warning. (decode_coding_iso2022): Modify for `DECODE_CHAR'. --- diff --git a/src/text-coding.c b/src/text-coding.c index 6baefdd..970a7bf 100644 --- a/src/text-coding.c +++ b/src/text-coding.c @@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.3. Not in FSF. */ /* Rewritten by Ben Wing . */ -/* Rewritten by MORIOKA Tomohiko for XEmacs UTF-2000. */ +/* Rewritten by MORIOKA Tomohiko for XEmacs CHISE. */ #include #include "lisp.h" @@ -3328,7 +3328,7 @@ decode_add_er_char (struct decoding_stream *str, Emchar c, make_int (base))); Emchar chr = NILP (char_type) - ? DECODE_CHAR (ccs, code) + ? DECODE_CHAR (ccs, code, 0) : decode_builtin_char (ccs, code); DECODE_ADD_UCS_CHAR (chr, dst); @@ -3394,7 +3394,7 @@ char_encode_as_entity_reference (Emchar ch, char* buf) if ( (code_point >= 0) && (NILP (char_type) - || DECODE_CHAR (ccs, code_point) != ch) ) + || DECODE_CHAR (ccs, code_point, 0) != ch) ) { Lisp_Object ret; @@ -3950,10 +3950,11 @@ decode_coding_big5 (Lstream *decoding, const Extbyte *src, { #ifdef UTF2000 int code_point = (cpos << 8) | c; - Emchar char_id = decode_defined_char (ccs, code_point); + Emchar char_id = decode_defined_char (ccs, code_point, 0); if (char_id < 0) - char_id = DECODE_CHAR (Vcharset_chinese_big5, code_point); + char_id + = DECODE_CHAR (Vcharset_chinese_big5, code_point, 0); DECODE_ADD_UCS_CHAR (char_id, dst); #else unsigned char b1, b2, b3; @@ -4534,13 +4535,13 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, if (!NILP (ccs)) { - char_id = decode_defined_char (ccs, cpos); + char_id = decode_defined_char (ccs, cpos, 0); if (char_id < 0) char_id = cpos; } else - ccs = char_id; + char_id = cpos; COMPOSE_ADD_CHAR (str, char_id, dst); cpos = 0; counter = 0; @@ -5695,7 +5696,7 @@ decode_coding_iso2022 (Lstream *decoding, const Extbyte *src, COMPOSE_ADD_CHAR (str, DECODE_CHAR (charset, ((cpos & 0x7F7F7F) << 8) - | (c & 0x7F)), + | (c & 0x7F), 0), dst); cpos = 0; counter = 0;