[Emacs-diffs] emacs/src coding.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/06/16 01:59:44

Modified files:
        src            : coding.c 

Log message:
        (detect_coding_utf_16): Fix previous change.

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

Patches:
Index: coding.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/coding.c,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- coding.c    16 Jun 2009 01:17:10 -0000      1.432
+++ coding.c    16 Jun 2009 01:59:44 -0000      1.433
@@ -1665,10 +1665,11 @@
       e[c1] = 1;
       o[c2] = 1;
 
-      detect_info->rejected
-       |= (CATEGORY_MASK_UTF_16_BE | CATEGORY_MASK_UTF_16_LE);
+      detect_info->rejected |= (CATEGORY_MASK_UTF_16_AUTO
+                               |CATEGORY_MASK_UTF_16_BE
+                               | CATEGORY_MASK_UTF_16_LE);
 
-      while (1)
+      while (detect_info->rejected != CATEGORY_MASK_UTF_16)
        {
          TWO_MORE_BYTES (c1, c2);
          if (c2 < 0)
@@ -1677,18 +1678,17 @@
            {
              e[c1] = 1;
              e_num++;
-             if (e_num >= 128 && o_num >= 128)
-               break;
+             if (e_num >= 128)
+               detect_info->rejected |= CATEGORY_MASK_UTF_16_BE_NOSIG;
            }
          if (! o[c2])
            {
              o[c2] = 1;
              o_num++;
-             if (e_num >= 128 && o_num >= 128)
-               break;
+             if (o_num >= 128)
+               detect_info->rejected |= CATEGORY_MASK_UTF_16_LE_NOSIG;
            }
        }
-      detect_info->rejected |= CATEGORY_MASK_UTF_16;
       return 0;
     }