gistfile1

diff -r 8b86b69546a9 src/ops.c
--- a/src/ops.c	Wed Feb 20 21:26:00 2013 +0100
+++ b/src/ops.c	Thu Feb 28 14:41:31 2013 +0900
@@ -2194,7 +2194,9 @@
 		{
 		    /* This is slow, but it handles replacing a single-byte
 		     * with a multi-byte and the other way around. */
-		    oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n);
+
+		    if (curwin->w_cursor.lnum == oap->end.lnum)
+			oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n);
 		    n = State;
 		    State = REPLACE;
 		    ins_char(c);