2 files changed, 8 insertions, 0 deletions

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  <eliz@gnu.org>
+
+        * 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  <eggert@cs.ucla.edu>
 
         * 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);
   }