diff options
| author | Kenichi Handa | 2013-07-20 20:45:50 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2013-07-20 20:45:50 +0900 |
| commit | 0efe47a860bba25617132f02e2220056bfa098b0 (patch) | |
| tree | 5290b5f73956137d5e2284fa9ed0118e361b76b7 /src/coding.c | |
| parent | 1145cc5221f17c102892824956d129112e741ad0 (diff) | |
| download | emacs-0efe47a860bba25617132f02e2220056bfa098b0.tar.gz emacs-0efe47a860bba25617132f02e2220056bfa098b0.zip | |
coding.c (decode_coding_iso_2022): Fix previous change.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index ad2042672b2..3acbd090e13 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -3736,8 +3736,9 @@ decode_coding_iso_2022 (struct coding_system *coding) | |||
| 3736 | charset = CHARSET_FROM_ID (charset_id_2); | 3736 | charset = CHARSET_FROM_ID (charset_id_2); |
| 3737 | ONE_MORE_BYTE (c1); | 3737 | ONE_MORE_BYTE (c1); |
| 3738 | if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0) | 3738 | if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0) |
| 3739 | || ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4) | 3739 | || (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) |
| 3740 | ? c1 >= 0x80 : c1 < 0x80)) | 3740 | && ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4) |
| 3741 | ? c1 >= 0x80 : c1 < 0x80))) | ||
| 3741 | goto invalid_code; | 3742 | goto invalid_code; |
| 3742 | break; | 3743 | break; |
| 3743 | 3744 | ||
| @@ -3752,8 +3753,9 @@ decode_coding_iso_2022 (struct coding_system *coding) | |||
| 3752 | charset = CHARSET_FROM_ID (charset_id_3); | 3753 | charset = CHARSET_FROM_ID (charset_id_3); |
| 3753 | ONE_MORE_BYTE (c1); | 3754 | ONE_MORE_BYTE (c1); |
| 3754 | if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0) | 3755 | if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0) |
| 3755 | || ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4) | 3756 | || (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS) |
| 3756 | ? c1 >= 0x80 : c1 < 0x80)) | 3757 | && ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4) |
| 3758 | ? c1 >= 0x80 : c1 < 0x80))) | ||
| 3757 | goto invalid_code; | 3759 | goto invalid_code; |
| 3758 | break; | 3760 | break; |
| 3759 | 3761 | ||