From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 31 May 2014 18:23:53 +0000 (+0300)
Subject: Hopefully fix bug #16433 with corruption of newline_cache in Rmail.
X-Git-Tag: emacs-24.3.92~137
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc329caae6a6991ff28c38144c210bf78528249b;p=emacs.git

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 2daee8c2d97..bde0ec68c53 100644
--- 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 03519eda68d..3b7961b930a 100644
--- 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);