diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-01-24 20:41:39 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-01-24 20:41:39 -0800 |
| commit | 830e46e61ba1316e771c72a15e709d3d12e150b7 (patch) | |
| tree | c88c21c32f65dc77d8f76c315a41a519a585dc8f /src/coding.c | |
| parent | 3d4147bae3f03502acb3d12a5c9747129cc0c6aa (diff) | |
| parent | 345f866e048bdc11bc38d894a7eaaa47335443e2 (diff) | |
Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/coding.c b/src/coding.c index a9bf9032a69..93da9db0d36 100644 --- a/src/coding.c +++ b/src/coding.c @@ -3057,20 +3057,7 @@ detect_coding_iso_2022 (struct coding_system *coding, } 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) @@ -3121,6 +3108,20 @@ detect_coding_iso_2022 (struct coding_system *coding, } 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; |