(detect_coding_charset): Fix change from 2008-10-21.

Also, check iso-latin-*, not only iso-8859-*.

diff --git a/src/ChangeLog b/src/ChangeLog
index 43a72da..41c25d2 100644 (file)
--- 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 7438fc0..020a140 100644 (file)
--- 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;