(Finsert_file_contents): Adjust offsets when replacing

within a narrowed buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2cf4120f51ea95738ba3c1d5abf77ae0ed2b1f27..38d891bc8bada7f96b03513b65eff46840274034 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/fileio.c b/src/fileio.c
index 9095cc458784f24fa38ea53d056a679d025abf69..269dd33455e53c92c71e59c7860d5347273acbf9 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4338,10 +4338,12 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       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