(detect_coding_system): Fix handling of null_byte_fount.

diff --git a/src/ChangeLog b/src/ChangeLog
index dbb34ac3e2d2dbf060518a25b695bcc9e1f72700..93aa087f2b946e19af598f2309e190bab74208d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-15  Kenichi Handa  <handa@m17n.org>
+
+       * coding.c (detect_coding_system): Fix handling of
+       null_byte_found.
+
 2009-01-14  Jason Rumney  <jasonr@gnu.org>
 
        * frame.c (x_set_font): Always store a font to the font parameter,

diff --git a/src/coding.c b/src/coding.c
index 21c594543469056c5e51a1fdceb5ceed00db6fec..8c7ddf34db29141faa09240baeb2feb1d0b67cad 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -7905,10 +7905,11 @@ detect_coding_system (src, src_chars, src_bytes, highest, multibytep,
            }
        }
 
-      if ((detect_info.rejected & CATEGORY_MASK_ANY) == CATEGORY_MASK_ANY)
+      if ((detect_info.rejected & CATEGORY_MASK_ANY) == CATEGORY_MASK_ANY
+         || null_byte_found)
        {
          detect_info.found = CATEGORY_MASK_RAW_TEXT;
-         id = coding_categories[coding_category_raw_text].id;
+         id = CODING_SYSTEM_ID (Qno_conversion);
          val = Fcons (make_number (id), Qnil);
        }
       else if (! detect_info.rejected && ! detect_info.found)