Hopefully fix bug #16433 with corruption of newline_cache in Rmail.

 src/fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer
 with PT, not GPT.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2daee8c2d971563d55522bf55d184909eae01c44..bde0ec68c53cc37ed4b8f3e5b80e5bacc581ccee 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-31  Eli Zaretskii  <eliz@gnu.org>
 
+       * fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer
+       with PT, not GPT.  (Bug#16433)
+
        Revert last changes to GDB-visible symbols.
        * lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros.
        (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them.

diff --git a/src/fileio.c b/src/fileio.c
index 03519eda68d115480524a3077bc8d53b80eee02c..3b7961b930ac733daddeff82f85fc073aaaaa852 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4087,7 +4087,7 @@ by calling `format-decode', which see.  */)
          && SAVE_MODIFF >= MODIFF)
        we_locked_file = 1;
 #endif /* CLASH_DETECTION */
-      prepare_to_modify_buffer (GPT, GPT, NULL);
+      prepare_to_modify_buffer (PT, PT, NULL);
     }
 
   move_gap_both (PT, PT_BYTE);