Mercurial > emacs
changeset 88497:d2b9e0d4c2f6
(Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the
handling of charset list.
(encode_coding_iso_2022): Setup coding->safe_charsets in advance.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 14 May 2002 08:00:53 +0000 |
| parents | 959dea33a8d5 |
| children | 1dd66ce3fc9c |
| files | src/coding.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/coding.c Tue May 14 07:59:29 2002 +0000 +++ b/src/coding.c Tue May 14 08:00:53 2002 +0000 @@ -3433,6 +3433,9 @@ int c; CODING_GET_INFO (coding, attrs, eol_type, charset_list); + setup_iso_safe_charsets (attrs); + coding->safe_charsets + = (char *) XSTRING (CODING_ATTR_SAFE_CHARSETS(attrs))->data; ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs)); @@ -6811,8 +6814,8 @@ val = CODING_ATTR_CHARSET_LIST (attrs); charset_roman = CHARSET_FROM_ID (XINT (XCAR (val))), val = XCDR (val); - charset_kanji = CHARSET_FROM_ID (XINT (XCAR (val))), val = XCDR (val); - charset_kana = CHARSET_FROM_ID (XINT (XCAR (val))); + charset_kana = CHARSET_FROM_ID (XINT (XCAR (val))), val = XCDR (val); + charset_kanji = CHARSET_FROM_ID (XINT (XCAR (val))); if (c <= 0x7F) charset = charset_roman; @@ -6823,7 +6826,7 @@ } else { - int s1 = c >> 8, s2 = c & 0x7F; + int s1 = c >> 8, s2 = c & 0xFF; if (s1 < 0x81 || (s1 > 0x9F && s1 < 0xE0) || s1 > 0xEF || s2 < 0x40 || s2 == 0x7F || s2 > 0xFC)