# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1203018103 0
# Node ID 75f72cab97715f181c39b3b265769308021ddb16
# Parent  b842643f6e2459644c45c7e0a1af99c4782ea9fc
(Finsert_file_contents): Adjust offsets when replacing
within a narrowed buffer.

diff -r b842643f6e24 -r 75f72cab9771 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 14 18:46:06 2008 +0000
+++ b/src/ChangeLog	Thu Feb 14 19:41:43 2008 +0000
@@ -1,3 +1,8 @@
+2008-02-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* fileio.c (Finsert_file_contents): Adjust offsets when replacing
+	within a narrowed buffer.
+
 2008-02-14  Kenichi Handa  <handa@ni.aist.go.jp>
 
 	* coding.c (decode_coding_object, encode_coding_object):
diff -r b842643f6e24 -r 75f72cab9771 src/fileio.c
--- a/src/fileio.c	Thu Feb 14 18:46:06 2008 +0000
+++ b/src/fileio.c	Thu Feb 14 19:41:43 2008 +0000
@@ -4338,10 +4338,12 @@
       SET_PT_BOTH (temp, same_at_start);
       same_at_start_charpos
 	= buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
-				  same_at_start);
+				  same_at_start - BEGV_BYTE
+				  + BUF_BEG_BYTE (XBUFFER (conversion_buffer)));
       inserted_chars
 	= (buf_bytepos_to_charpos (XBUFFER (conversion_buffer),
-				   same_at_start + inserted)
+				   same_at_start + inserted - BEGV_BYTE
+				  + BUF_BEG_BYTE (XBUFFER (conversion_buffer)))
 	   - same_at_start_charpos);
       /* This binding is to avoid ask-user-about-supersession-threat
 	 being called in insert_from_buffer (via in