martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca

Browse Source
This commit is contained in:
Glenn Morris
2013-01-24 20:41:39 -08:00
parent 3d4147bae3 345f866e04
commit 830e46e61b
10 changed files with 223 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/coding.c
View File

@@ -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;