From: Kenichi Handa <handa@gnu.org>
Date: Sun, 5 Oct 2014 08:52:04 +0000 (+0900)
Subject: coding.c (detect_coding_iso_2022): Fix previous change.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21c1abcae174704033a7f5b164081503501b921e;p=emacs.git

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

diff --git a/src/coding.c b/src/coding.c
index 02e59286dc8..f63d710ce9a 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3166,7 +3166,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
 	  if (inhibit_iso_escape_detection)
 	    break;
 	  single_shifting = 0;
-	  rejected |= CATEGORY_MASK_ISO_7BIT;
+	  rejected |= CATEGORY_MASK_ISO_7BIT | CATEGORY_MASK_ISO_7_ELSE;
 	  if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
 	      & CODING_ISO_FLAG_SINGLE_SHIFT)
 	    {
@@ -3193,9 +3193,9 @@ detect_coding_iso_2022 (struct coding_system *coding,
 	      single_shifting = 0;
 	      break;
 	    }
+	  rejected |= CATEGORY_MASK_ISO_7BIT | CATEGORY_MASK_ISO_7_ELSE;
 	  if (c >= 0xA0)
 	    {
-	      rejected |= CATEGORY_MASK_ISO_7BIT | CATEGORY_MASK_ISO_7_ELSE;
 	      found |= CATEGORY_MASK_ISO_8_1;
 	      /* Check the length of succeeding codes of the range
                  0xA0..0FF.  If the byte length is even, we include