From: Kenichi Handa <handa@m17n.org>
Date: Fri, 24 Feb 2006 06:46:54 +0000 (+0000)
Subject: (Finsert_file_contents): When a text is replaced
X-Git-Tag: emacs-pretest-22.0.90~3916
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77343e1d1c4d26539f48e32754707df15e6e2ad2;p=emacs.git

(Finsert_file_contents): When a text is replaced
partially, be sure to set point before the inserted characters.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fe8b13409ef..d8e0b6fb4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-24  Kenichi Handa  <handa@m17n.org>
+
+	* fileio.c (Finsert_file_contents): When a text is replaced
+	partially, be sure to set point before the inserted characters.
+
 2006-02-23  Zhang Wei  <id.brep@gmail.com>  (tiny change)
 
 	* xfns.c (Fx_file_dialog): Return a decoded file name.
diff --git a/src/fileio.c b/src/fileio.c
index 66546b3b556..73dd799f806 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4414,6 +4414,8 @@ actually used.  */)
 
       /* Set `inserted' to the number of inserted characters.  */
       inserted = PT - temp;
+      /* Set point before the inserted characters.  */
+      SET_PT_BOTH (temp, same_at_start);
 
       xfree (conversion_buffer);
       emacs_close (fd);