Fix typos in ChangeLogs.

2 files changed, 25 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e1fff6fc25..0506a68ceaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,9 +13,9 @@
         CODING-SYSTEM is `emacs', do not check if CODING-SYSTEM is
         appropriate for setting.
 
-        * international/mule-cmds.el (select-safe-coding-system): If
-        DEFAULT-CODING-SYSTEM is prefer-utf-8 and the buffer contains
-        multibyte characters, return utf-8 (or one of it's siblings).
+        * international/mule-cmds.el (select-safe-coding-system):
+        If DEFAULT-CODING-SYSTEM is prefer-utf-8 and the buffer contains
+        multibyte characters, return utf-8 (or one of its siblings).
 
         * international/mule-conf.el (prefer-utf-8): New coding system.
         (file-coding-system-alist): Use prefer-utf-8 as default for Elisp
@@ -29,9 +29,9 @@
 
 2013-06-27  Dmitry Gutov  <dgutov@yandex.ru>
 
-        * emacs-lisp/package-x.el (package-upload-buffer-internal): Adapt
-        to `package-desc-version' being a list.  Use
-        `package--ac-desc-version' to retrieve version from a package
+        * emacs-lisp/package-x.el (package-upload-buffer-internal):
+        Adapt to `package-desc-version' being a list.
+        Use `package--ac-desc-version' to retrieve version from a package
         archive element.
 
 2013-06-27  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/src/ChangeLog b/src/ChangeLog
index 813cbe1da06..2f1c553576f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -33,6 +33,25 @@
         :prefer-utf-8.
         (syms_of_coding): Adjusted for coding_arg_undecided_max.
 
+2013-06-28  Kenichi Handa  <handa@gnu.org>
+
+        * coding.h (define_coding_undecided_arg_index): New enum.
+        (coding_attr_index): New members
+        coding_attr_undecided_inhibit_null_byte_detection,
+        coding_attr_undecided_inhibit_iso_escape_detection,
+        coding_attr_undecided_prefer_utf_8.
+        (undecided_spec): New struct.
+        (struct coding_system): New member `undecided' of the member
+        `spec'.
+
+        * coding.c (setup_coding_system): Handle CODING->spec.undecided.
+        (detect_coding): Likewise.
+        (detect_coding_system): Likewise.
+        (Fdefine_coding_system_internal): New coding system properties
+        :inhibit-null-byte-detection, :inhibit-iso-escape-detection, and
+        :prefer-utf-8.
+        (syms_of_coding): Adjust for coding_arg_undecided_max.
+
 2013-06-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * image.c (x_from_xcolors): Remove unused local.