From: Kenichi Handa Date: Wed, 17 Jun 2009 00:42:17 +0000 (+0000) Subject: (detect_coding_utf_16): Fix previous change. X-Git-Tag: emacs-pretest-23.0.95~37 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f1faf1cc202ec9ee543bd9c6b35d89e162fbe5b;p=emacs.git (detect_coding_utf_16): Fix previous change. --- diff --git a/src/ChangeLog b/src/ChangeLog index 6a6e90aafb9..21803be7508 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-06-17 Andreas Schwab + + * coding.c (detect_coding_utf_16): Fix previous change. + 2009-06-16 Kenichi Handa * coding.c (detect_coding_utf_16): Fix the logic of rejecting diff --git a/src/coding.c b/src/coding.c index cde56d9af42..6dbf05ce0aa 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1669,7 +1669,8 @@ detect_coding_utf_16 (coding, detect_info) |CATEGORY_MASK_UTF_16_BE | CATEGORY_MASK_UTF_16_LE); - while (detect_info->rejected != CATEGORY_MASK_UTF_16) + while ((detect_info->rejected & CATEGORY_MASK_UTF_16) + != CATEGORY_MASK_UTF_16) { TWO_MORE_BYTES (c1, c2); if (c2 < 0)