diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-06-17 00:42:17 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-06-17 00:42:17 +0000 |
| commit | 7f1faf1cc202ec9ee543bd9c6b35d89e162fbe5b (patch) | |
| tree | 904d19b376da9c907519a8a82c5b40b23343ee26 | |
| parent | f6adc23c8040d4773732611c4f59090f74304927 (diff) | |
| download | emacs-7f1faf1cc202ec9ee543bd9c6b35d89e162fbe5b.tar.gz emacs-7f1faf1cc202ec9ee543bd9c6b35d89e162fbe5b.tar.bz2 emacs-7f1faf1cc202ec9ee543bd9c6b35d89e162fbe5b.zip | |
(detect_coding_utf_16): Fix previous change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/coding.c | 3 |
2 files changed, 6 insertions, 1 deletions
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 <schwab@linux-m68k.org> + + * coding.c (detect_coding_utf_16): Fix previous change. + 2009-06-16 Kenichi Handa <handa@m17n.org> * 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) |