auto upstream

1 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 939fd61c87f..c64416a6454 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * fileio.c (Finsert_file_contents): Don't put tail into head area,
+        as that confuses set-auto-coding, so insist on the head-read
+        returning the full 1024 bytes.  Let lseek compute the tail offset;
+        less work for us.  Do not ignore I/O errors when reading the tail.
+
         * xdisp.c: Minor style fixes.
         (init_iterator): Hoist assignment out of if-expression.
         (markpos_of_region): Callers now test for sign, not for -1.