aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-13 13:29:15 +0300
committerEli Zaretskii2013-07-13 13:29:15 +0300
commitf9a74c4cc26f349abaaa073d4f56a09405a6f8c3 (patch)
tree92676e542b7c2750fcef4442a40d768797816bf8 /src
parent6ee585de08efb925150e105a517ec12e1cc9bdb2 (diff)
downloademacs-f9a74c4cc26f349abaaa073d4f56a09405a6f8c3.tar.gz
emacs-f9a74c4cc26f349abaaa073d4f56a09405a6f8c3.zip
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'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/coding.c2
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 @@
12013-07-13 Eli Zaretskii <eliz@gnu.org>
2
3 * coding.c (syms_of_coding): Set up inhibit-null-byte-detection
4 and inhibit-iso-escape-detection attributes of 'undecided'.
5 (Bug#14822)
6
12013-07-13 Paul Eggert <eggert@cs.ucla.edu> 72013-07-13 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 * deps.mk (sysdep.o): Remove dependency on ../lib/ignore-value.h. 9 * 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.");
11218 plist[13] = build_pure_c_string ("No conversion on encoding, automatic conversion on decoding."); 11218 plist[13] = build_pure_c_string ("No conversion on encoding, automatic conversion on decoding.");
11219 plist[15] = args[coding_arg_eol_type] = Qnil; 11219 plist[15] = args[coding_arg_eol_type] = Qnil;
11220 args[coding_arg_plist] = Flist (16, plist); 11220 args[coding_arg_plist] = Flist (16, plist);
11221 args[coding_arg_undecided_inhibit_null_byte_detection] = make_number (0);
11222 args[coding_arg_undecided_inhibit_iso_escape_detection] = make_number (0);
11221 Fdefine_coding_system_internal (coding_arg_undecided_max, args); 11223 Fdefine_coding_system_internal (coding_arg_undecided_max, args);
11222 } 11224 }
11223 11225