diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2009-02-28 12:05:36 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2009-02-28 12:05:36 +0000 |
| commit | a4aee864ad4655ad2cfa691eae5f3797e2f38bcd (patch) | |
| tree | 3c6aac27e706a02ea1f43025671333f89a84d828 /src | |
| parent | b4b7bab7ca0cbe68d4a701e26c687af971f0ebb4 (diff) | |
| download | emacs-a4aee864ad4655ad2cfa691eae5f3797e2f38bcd.tar.gz | |
(detect_coding_charset): Fix change from 2008-10-21.
Also, check iso-latin-*, not only iso-8859-*.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/coding.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 43a72dae60b..41c25d27ef0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-02-28 Eli Zaretskii <eliz@gnu.org> + + * coding.c (detect_coding_charset): Fix change from 2008-10-21. + Also, check iso-latin-*, not only iso-8859-*. + 2009-02-27 Glenn Morris <rgm@gnu.org> * callint.c (Finteractive): Doc fix. diff --git a/src/coding.c b/src/coding.c index 7438fc0d337..020a1401575 100644 --- a/src/coding.c +++ b/src/coding.c @@ -5103,7 +5103,10 @@ detect_coding_charset (coding, detect_info) valids = AREF (attrs, coding_attr_charset_valids); name = CODING_ID_NAME (coding->id); if (VECTORP (Vlatin_extra_code_table) - && strcmp ((char *) SDATA (SYMBOL_NAME (name)), "iso-8859-") == 0) + && (strncmp ((char *) SDATA (SYMBOL_NAME (name)), + "iso-8859-", sizeof ("iso-8859-") - 1) == 0 + || strncmp ((char *) SDATA (SYMBOL_NAME (name)), + "iso-latin-", sizeof ("iso-latin-") - 1) == 0)) check_latin_extra = 1; if (! NILP (CODING_ATTR_ASCII_COMPAT (attrs))) src += head_ascii; |