[Emacs-diffs] Changes to emacs/src/fileio.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/14 19:41:45

Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -b -r1.601 -r1.602
--- fileio.c    12 Feb 2008 21:35:14 -0000      1.601
+++ fileio.c    14 Feb 2008 19:41:43 -0000      1.602
@@ -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