procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(detect_coding_system): Fix handling of null_byte_fount.

Browse source
This commit is contained in:
Kenichi Handa 2009-01-15 07:13:39 +00:00
parent 0abcd9a8af
commit 4cddb209b4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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,

5
src/coding.c
View file

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