diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-07-08 02:22:05 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-07-08 02:22:05 +0000 |
| commit | f07190ca1fafd664e6775f9b307f2b4e1fca87c1 (patch) | |
| tree | f0d1b2918e937f5ed8598c48d78c744153e21f94 | |
| parent | 40149292c2bd97339d7849ad5d28f1e4419c2f33 (diff) | |
| download | emacs-f07190ca1fafd664e6775f9b307f2b4e1fca87c1.tar.gz | |
(detect_coding_sjis): Handle shift_jis-2004 correctly.
(encode_coding_sjis): Fix the code range check.
| -rw-r--r-- | src/coding.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 20583a388d1..a8f84378e66 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4671,6 +4671,12 @@ detect_coding_sjis (coding, detect_info) int consumed_chars = 0; int found = 0; int c; + Lisp_Object attrs, charset_list; + int max_first_byte_of_2_byte_code; + + CODING_GET_INFO (coding, attrs, charset_list); + max_first_byte_of_2_byte_code + = (XINT (Flength (charset_list)) > 3 ? 0xFC : 0xEF); detect_info->checked |= CATEGORY_MASK_SJIS; /* A coding system of this category is always ASCII compatible. */ @@ -4682,7 +4688,8 @@ detect_coding_sjis (coding, detect_info) ONE_MORE_BYTE (c); if (c < 0x80) continue; - if ((c >= 0x81 && c <= 0x9F) || (c >= 0xE0 && c <= 0xEF)) + if ((c >= 0x81 && c <= 0x9F) + || (c >= 0xE0 && c <= max_first_byte_of_2_byte_code)) { ONE_MORE_BYTE (c); if (c < 0x40 || c == 0x7F || c > 0xFC) @@ -5055,7 +5062,8 @@ encode_coding_sjis (coding) int c1, c2; c1 = code >> 8; - if (c1 == 0x21 || (c1 >= 0x23 && c1 < 0x25) + if (c1 == 0x21 || (c1 >= 0x23 && c1 <= 0x25) + || c1 == 0x28 || (c1 >= 0x2C && c1 <= 0x2F) || c1 >= 0x6E) { JIS_TO_SJIS2 (code); |