aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorAndreas Schwab2013-01-20 23:59:47 +0100
committerAndreas Schwab2013-01-20 23:59:47 +0100
commitba14c607ba7fdadb494b57a9788997059ba510bf (patch)
tree3fd77251e602be972b79e1cc3e528c44cd00ee9e /src/coding.c
parent114d4d84c89fc7a2a0187a8b44cba92735affc8e (diff)
downloademacs-ba14c607ba7fdadb494b57a9788997059ba510bf.tar.gz
emacs-ba14c607ba7fdadb494b57a9788997059ba510bf.zip
Fixes: debbugs:13505
* src/coding.c (detect_coding_iso_2022): Move back mis-reordered code at check_extra_latin label.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/coding.c b/src/coding.c
index 47d5e138e1c..20d5d92f046 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -3063,20 +3063,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
3063 } 3063 }
3064 if (single_shifting) 3064 if (single_shifting)
3065 break; 3065 break;
3066 check_extra_latin: 3066 goto check_extra_latin;
3067 if (! VECTORP (Vlatin_extra_code_table)
3068 || NILP (AREF (Vlatin_extra_code_table, c)))
3069 {
3070 rejected = CATEGORY_MASK_ISO;
3071 break;
3072 }
3073 if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
3074 & CODING_ISO_FLAG_LATIN_EXTRA)
3075 found |= CATEGORY_MASK_ISO_8_1;
3076 else
3077 rejected |= CATEGORY_MASK_ISO_8_1;
3078 rejected |= CATEGORY_MASK_ISO_8_2;
3079 break;
3080 3067
3081 default: 3068 default:
3082 if (c < 0) 3069 if (c < 0)
@@ -3127,6 +3114,20 @@ detect_coding_iso_2022 (struct coding_system *coding,
3127 } 3114 }
3128 break; 3115 break;
3129 } 3116 }
3117 check_extra_latin:
3118 if (! VECTORP (Vlatin_extra_code_table)
3119 || NILP (AREF (Vlatin_extra_code_table, c)))
3120 {
3121 rejected = CATEGORY_MASK_ISO;
3122 break;
3123 }
3124 if (CODING_ISO_FLAGS (&coding_categories[coding_category_iso_8_1])
3125 & CODING_ISO_FLAG_LATIN_EXTRA)
3126 found |= CATEGORY_MASK_ISO_8_1;
3127 else
3128 rejected |= CATEGORY_MASK_ISO_8_1;
3129 rejected |= CATEGORY_MASK_ISO_8_2;
3130 break;
3130 } 3131 }
3131 } 3132 }
3132 detect_info->rejected |= CATEGORY_MASK_ISO; 3133 detect_info->rejected |= CATEGORY_MASK_ISO;