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

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

(detect_coding_charset): Fix change from 2008-10-21.
Also, check iso-latin-*, not only iso-8859-*.
a4aee864 · Eli Zaretskii · b4b7bab7 · a4aee864 · a4aee864
Commit a4aee864 authored Feb 28, 2009 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/coding.c src/coding.c +4 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

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