Commit 4cddb209 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(detect_coding_system): Fix handling of null_byte_fount.

parent 0abcd9a8
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> 2009-01-14 Jason Rumney <jasonr@gnu.org>
   
* frame.c (x_set_font): Always store a font to the font parameter, * frame.c (x_set_font): Always store a font to the font parameter,
......
...@@ -7905,10 +7905,11 @@ detect_coding_system (src, src_chars, src_bytes, highest, multibytep, ...@@ -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; 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); val = Fcons (make_number (id), Qnil);
} }
else if (! detect_info.rejected && ! detect_info.found) else if (! detect_info.rejected && ! detect_info.found)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment