(detect_coding_system): Fix handling of null_byte_fount.

4cddb209 · Kenichi Handa · 0abcd9a8 · 4cddb209 · 4cddb209
Commit 4cddb209 authored Jan 15, 2009 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

src/ChangeLog src/ChangeLog +5 -0

src/coding.c src/coding.c +3 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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,

--- 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)