[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111191: Fixes: debbugs:13505

[Andreas Schwab]

------------------------------------------------------------
revno: 111191
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2013-01-20 23:59:47 +0100
message:
  Fixes: debbugs:13505
  
  * src/coding.c (detect_coding_iso_2022): Move back mis-reordered code
  at check_extra_latin label.
modified:
  src/ChangeLog
  src/coding.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-17 02:05:16 +0000
+++ b/src/ChangeLog     2013-01-20 22:59:47 +0000
@@ -1,3 +1,8 @@
+2013-01-20  Andreas Schwab  <address@hidden>
+
+       * coding.c (detect_coding_iso_2022): Move back mis-reordered code
+       at check_extra_latin label.  (Bug#13505)
+
 2013-01-17  Glenn Morris  <address@hidden>
 
        * fns.c (Frandom): Doc fix.

=== modified file 'src/coding.c'
--- a/src/coding.c      2013-01-01 09:11:05 +0000
+++ b/src/coding.c      2013-01-20 22:59:47 +0000
@@ -3063,20 +3063,7 @@
            }
          if (single_shifting)
            break;
-       check_extra_latin:
-         if (! VECTORP (Vlatin_extra_code_table)
-             || NILP (AREF (Vlatin_extra_code_table, c)))
-           {
-             rejected = CATEGORY_MASK_ISO;
-             break;
-           }
-         if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
-             & CODING_ISO_FLAG_LATIN_EXTRA)
-           found |= CATEGORY_MASK_ISO_8_1;
-         else
-           rejected |= CATEGORY_MASK_ISO_8_1;
-         rejected |= CATEGORY_MASK_ISO_8_2;
-         break;
+         goto check_extra_latin;
 
        default:
          if (c < 0)
@@ -3127,6 +3114,20 @@
                }
              break;
            }
+       check_extra_latin:
+         if (! VECTORP (Vlatin_extra_code_table)
+             || NILP (AREF (Vlatin_extra_code_table, c)))
+           {
+             rejected = CATEGORY_MASK_ISO;
+             break;
+           }
+         if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
+             & CODING_ISO_FLAG_LATIN_EXTRA)
+           found |= CATEGORY_MASK_ISO_8_1;
+         else
+           rejected |= CATEGORY_MASK_ISO_8_1;
+         rejected |= CATEGORY_MASK_ISO_8_2;
+         break;
        }
     }
   detect_info->rejected |= CATEGORY_MASK_ISO;