Merge: Fixes for Bug#8600 and Bug#8601.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3013418afec..75917224ca9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,11 @@
-2011-05-02  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * coding.c (detect_coding_charset): Fix typo: * 2 -> *4 (Bug#8601).
+
+        * charset.h (struct charset.code_space): Now has 15 elements, not 16.
+        * charset.c (Fdefine_charset_internal): Don't initialize
+        charset.code_space[15].  The value was garbage, on hosts with
+        32-bit int (Bug#8600).
 
         * lread.c (read_integer): Be more consistent with string-to-number.
         Use string_to_number to do the actual conversion; this avoids
@@ -8,8 +15,6 @@
         Return -1 if the digit is out of range for the base, -2 if it is
         not a digit in any supported base.  (Bug#8602)
 
-2011-04-30  Paul Eggert  <eggert@cs.ucla.edu>
-
         * doprnt.c (doprnt): Support arbitrary pI values, such as "I64".
 
         * dispnew.c (scrolling_window): Return 1 if we scrolled,