procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fdecode_sjis_char): Fix typo (0x7F->0xFF). Fix the

Browse source 
handling of charset list.
(encode_coding_iso_2022): Setup coding->safe_charsets in advance.
This commit is contained in:
Kenichi Handa 2002-05-14 08:00:53 +00:00
parent 6abd9323c6
commit 004068e4fc
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/coding.c
View file

@ -3433,6 +3433,9 @@ encode_coding_iso_2022 (coding)
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 @@ Return the corresponding character. */)
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 @@ Return the corresponding character. */)
}
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)