1 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1383b12ed68..ca37bb3ea56 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2013-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (acl_set_file): Don't test for errors unless
+        set_file_security returns FALSE.  Avoids spurious errors when
+        saving files.
+
+2013-01-21  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * fileio.c (Finsert_file_contents): Revert code introduced at
+        2013-01-18 in favor of the simpler and generally better fix.
+        Save stack space by removing 'buffer' and reusing 'read_buf'
+        where appropriate.
+
 2013-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * lisp.h (eabs): Define unconditionally (Bug#13419).