[Emacs-diffs] emacs/src coding.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/02/28 13:52:03

Modified files:
        src            : coding.c 

Log message:
        (detect_coding_charset): Fix last change for non-latin charsets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.421&r2=1.422

Patches:
Index: coding.c
===================================================================
RCS file: /sources/emacs/emacs/src/coding.c,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -b -r1.421 -r1.422
--- coding.c    28 Feb 2009 13:37:33 -0000      1.421
+++ coding.c    28 Feb 2009 13:52:03 -0000      1.422
@@ -5102,12 +5102,12 @@
   attrs = CODING_ID_ATTRS (coding->id);
   valids = AREF (attrs, coding_attr_charset_valids);
   name = CODING_ID_NAME (coding->id);
-  if (VECTORP (Vlatin_extra_code_table)
-      && (strncmp ((char *) SDATA (SYMBOL_NAME (name)),
+  if (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))
+                 "iso-latin-", sizeof ("iso-latin-") - 1) == 0)
     check_latin_extra = 1;
+
   if (! NILP (CODING_ATTR_ASCII_COMPAT (attrs)))
     src += head_ascii;
 
@@ -5128,7 +5128,8 @@
       if (c >= 0x80)
        {
          if (c < 0xA0
-             && (!check_latin_extra
+             && check_latin_extra
+             && (!VECTORP (Vlatin_extra_code_table)
                  || NILP (XVECTOR (Vlatin_extra_code_table)->contents[c])))
            break;
          found = CATEGORY_MASK_CHARSET;