2 files changed, 8 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dbb34ac3e2d..93aa087f2b9 100644
--- 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 21c59454346..8c7ddf34db2 100644
--- 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)