diff options
| author | Kenichi Handa | 2009-07-08 02:23:19 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2009-07-08 02:23:19 +0000 |
| commit | edb61b39fd80ced68dee7460716d2db6857fab28 (patch) | |
| tree | f1d6832349e90701594ea279db2e41aff3707777 | |
| parent | f07190ca1fafd664e6775f9b307f2b4e1fca87c1 (diff) | |
| download | emacs-edb61b39fd80ced68dee7460716d2db6857fab28.tar.gz emacs-edb61b39fd80ced68dee7460716d2db6857fab28.zip | |
(JIS_TO_SJIS2): Fix the code range check.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/coding.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d9ff8b1dfd2..94c71a92176 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-07-08 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * coding.h (JIS_TO_SJIS2): Fix the code range check. | ||
| 4 | |||
| 5 | * coding.c (detect_coding_sjis): Handle shift_jis-2004 correctly. | ||
| 6 | (encode_coding_sjis): Fix the code range check. | ||
| 7 | |||
| 1 | 2009-07-07 Chong Yidong <cyd@stupidchicken.com> | 8 | 2009-07-07 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 3 | * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory) | 10 | * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory) |
diff --git a/src/coding.h b/src/coding.h index 153ec952093..450433fda96 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -630,7 +630,7 @@ struct coding_system | |||
| 630 | if (j1 & 1) \ | 630 | if (j1 & 1) \ |
| 631 | { \ | 631 | { \ |
| 632 | s1 = (j1 <= 0x25 ? 0xF0 + (j1 - 0x21) / 2 \ | 632 | s1 = (j1 <= 0x25 ? 0xF0 + (j1 - 0x21) / 2 \ |
| 633 | : j1 <= 0x27 ? 0xF3 + (j1 - 0x2D) / 2 \ | 633 | : j1 <= 0x2F ? 0xF3 + (j1 - 0x2D) / 2 \ |
| 634 | : 0xF5 + (j1 - 0x6F) / 2); \ | 634 | : 0xF5 + (j1 - 0x6F) / 2); \ |
| 635 | s2 = j2 + ((j2 >= 0x60) ? 0x20 : 0x1F); \ | 635 | s2 = j2 + ((j2 >= 0x60) ? 0x20 : 0x1F); \ |
| 636 | } \ | 636 | } \ |