merge trunk

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 9371196677535dc3d3dd08af4755286631fa7d6c..04f5f0d6bbe8786aa8983c831240f79f6af780c5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2014-01-27  K. Handa  <handa@gnu.org>
+
+       Fix bug#16286 by the different way than revno:116158 to preserve
+       the code detection behavior of 24.3.
+
+       * coding.h (struct coding_system): New member detected_utf8_bytes.
+
+       * coding.c (detect_coding_utf_8): Set coding->detected_utf8_bytes.
+       (decode_coding_gap): Use short cut for UTF-8 file reading only
+       when coding->detected_utf8_bytes equals to coding->src_bytes.
+
+       * fileio.c (Finsert_file_contents): Cancel the previous change.
+
 2014-01-29  Martin Rudalics  <rudalics@gmx.at>
 
        * w32fns.c (x_set_tool_bar_lines): Don't clear area on frames