From f9a74c4cc26f349abaaa073d4f56a09405a6f8c3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 13 Jul 2013 13:29:15 +0300 Subject: [PATCH] Fix bug #14822 with decoding when inhibit-null-byte-detection is non-nil. src/coding.c (syms_of_coding): Set up inhibit-null-byte-detection and inhibit-iso-escape-detection attributes of 'undecided'. --- src/ChangeLog | 6 ++++++ src/coding.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 59fefb258c0..4bd72f831cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-07-13 Eli Zaretskii + + * coding.c (syms_of_coding): Set up inhibit-null-byte-detection + and inhibit-iso-escape-detection attributes of 'undecided'. + (Bug#14822) + 2013-07-13 Paul Eggert * deps.mk (sysdep.o): Remove dependency on ../lib/ignore-value.h. diff --git a/src/coding.c b/src/coding.c index 1ab59294b98..a1494ad38aa 100644 --- a/src/coding.c +++ b/src/coding.c @@ -11218,6 +11218,8 @@ character."); plist[13] = build_pure_c_string ("No conversion on encoding, automatic conversion on decoding."); plist[15] = args[coding_arg_eol_type] = Qnil; args[coding_arg_plist] = Flist (16, plist); + args[coding_arg_undecided_inhibit_null_byte_detection] = make_number (0); + args[coding_arg_undecided_inhibit_iso_escape_detection] = make_number (0); Fdefine_coding_system_internal (coding_arg_undecided_max, args); } -- 2.11.4.GIT