merge from trunk

1 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 70d722a02a4..e4dcfffa02f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2013-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Fix recovering from possible decompression error.  Since
+        insert_from_gap doesn't always move point, we can't use PT as
+        the position where the partially decompressed data ends, and
+        should count how may bytes was produced so far.
+        * decompress.c (struct decompress_unwind_data): Add nbytes member.
+        (unwind_decompress): Really delete partially uncompressed data.
+        (Fzlib_decompress_region): Take decompressed data size into account.
+
+2013-08-26  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * syntax.c (init_syntax_once): Adjust comment and do an early
+        initialization of Qchar_table_extra_slots just once...
+        * casetab.c (init_casetab_once):
+        * category.c (init_category_once):
+        * character.c (syms_of_character):
+        * coding.c (syms_of_coding):
+        * xdisp.c (syms_of_xdisp): ...and omit it here.
+
 2013-08-24  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (get_next_display_element): Don't apply to characters