aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-07-01 14:44:44 -0700
committerPaul Eggert2013-07-01 14:44:44 -0700
commitab71f1741c2583d2ae7c753743fc5da49a5ad093 (patch)
tree69a99eeab175b937f5c08e0ee0bc896dd3737d98 /src
parent8f43ce497c3fcd76d0d3be2d8a0506c53c757fb3 (diff)
downloademacs-ab71f1741c2583d2ae7c753743fc5da49a5ad093.tar.gz
emacs-ab71f1741c2583d2ae7c753743fc5da49a5ad093.zip
Remove duplicate ChangeLog entry, again.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 061083af6cd..552ce4f70a2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -82,24 +82,6 @@
82 :prefer-utf-8. 82 :prefer-utf-8.
83 (syms_of_coding): Adjust for coding_arg_undecided_max. 83 (syms_of_coding): Adjust for coding_arg_undecided_max.
84 84
852013-06-28 Kenichi Handa <handa@gnu.org>
86
87 * coding.h (define_coding_undecided_arg_index): New enum.
88 (coding_attr_index): New members
89 coding_attr_undecided_inhibit_null_byte_detection,
90 coding_attr_undecided_inhibit_iso_escape_detection,
91 coding_attr_undecided_prefer_utf_8.
92 (undecided_spec): New struct.
93 (struct coding_system): New member `undecided' of the member `spec'.
94
95 * coding.c (setup_coding_system): Handle CODING->spec.undecided.
96 (detect_coding): Likewise.
97 (detect_coding_system): Likewise.
98 (Fdefine_coding_system_internal): New coding system properties
99 :inhibit-null-byte-detection, :inhibit-iso-escape-detection, and
100 :prefer-utf-8.
101 (syms_of_coding): Adjust for coding_arg_undecided_max.
102
1032013-06-28 Paul Eggert <eggert@cs.ucla.edu> 852013-06-28 Paul Eggert <eggert@cs.ucla.edu>
104 86
105 * image.c (x_from_xcolors): Remove unused local. 87 * image.c (x_from_xcolors): Remove unused local.