From: Kenichi Handa <handa@gnu.org>
Date: Sat, 20 Jul 2013 11:45:50 +0000 (+0900)
Subject: coding.c (decode_coding_iso_2022): Fix previous change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1760
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0efe47a860bba25617132f02e2220056bfa098b0;p=emacs.git

coding.c (decode_coding_iso_2022): Fix previous change.
---

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)
 		charset = CHARSET_FROM_ID (charset_id_2);
 	      ONE_MORE_BYTE (c1);
 	      if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)
-		  || ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
-		      ? c1 >= 0x80 : c1 < 0x80))
+		  || (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS)
+		      && ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
+			  ? c1 >= 0x80 : c1 < 0x80)))
 		goto invalid_code;
 	      break;
 
@@ -3752,8 +3753,9 @@ decode_coding_iso_2022 (struct coding_system *coding)
 		charset = CHARSET_FROM_ID (charset_id_3);
 	      ONE_MORE_BYTE (c1);
 	      if (c1 < 0x20 || (c1 >= 0x80 && c1 < 0xA0)
-		  || ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
-		      ? c1 >= 0x80 : c1 < 0x80))
+		  || (! (CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_SEVEN_BITS)
+		      && ((CODING_ISO_FLAGS (coding) & CODING_ISO_FLAG_LEVEL_4)
+			  ? c1 >= 0x80 : c1 < 0x80)))
 		goto invalid_code;
 	      break;