1 files changed, 18 insertions, 24 deletions

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index c9a99fef84..18facef13c 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -1961,11 +1961,14 @@ static int op_replace(oparg_T *oap, int c)
     while (ltoreq(curwin->w_cursor, oap->end)) {
       n = gchar_cursor();
       if (n != NUL) {
-        if (utf_char2len(c) > 1 || utf_char2len(n) > 1) {
+        int new_byte_len = utf_char2len(c);
+        int old_byte_len = utfc_ptr2len(get_cursor_pos_ptr());
+
+        if (new_byte_len > 1 || old_byte_len > 1) {
           // This is slow, but it handles replacing a single-byte
           // with a multi-byte and the other way around.
           if (curwin->w_cursor.lnum == oap->end.lnum) {
-            oap->end.col += utf_char2len(c) - utf_char2len(n);
+            oap->end.col += new_byte_len - old_byte_len;
           }
           replace_character(c);
         } else {
@@ -2315,33 +2318,24 @@ void op_insert(oparg_T *oap, long count1)
     // The user may have moved the cursor before inserting something, try
     // to adjust the block for that.  But only do it, if the difference
     // does not come from indent kicking in.
-    if (oap->start.lnum == curbuf->b_op_start_orig.lnum
-        && !bd.is_MAX
-        && !did_indent) {
+    if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX && !did_indent) {
       const int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd);
 
-      if (!bd.is_MAX) {
-        if (oap->op_type == OP_INSERT
-            && oap->start.col + oap->start.coladd
-            != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
-          oap->start.col = curbuf->b_op_start_orig.col;
-          pre_textlen -= t - oap->start_vcol;
-          oap->start_vcol = t;
-        } else if (oap->op_type == OP_APPEND
-                   && oap->start.col + oap->start.coladd
-                   >= curbuf->b_op_start_orig.col
-                   + curbuf->b_op_start_orig.coladd) {
-          oap->start.col = curbuf->b_op_start_orig.col;
-          // reset pre_textlen to the value of OP_INSERT
-          pre_textlen += bd.textlen;
-          pre_textlen -= t - oap->start_vcol;
-          oap->start_vcol = t;
-          oap->op_type = OP_INSERT;
-        }
-      } else if (bd.is_MAX && oap->op_type == OP_APPEND) {
+      if (oap->op_type == OP_INSERT
+          && oap->start.col + oap->start.coladd
+          != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
+        oap->start.col = curbuf->b_op_start_orig.col;
+        pre_textlen -= t - oap->start_vcol;
+        oap->start_vcol = t;
+      } else if (oap->op_type == OP_APPEND
+                 && oap->start.col + oap->start.coladd
+                 >= curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
+        oap->start.col = curbuf->b_op_start_orig.col;
         // reset pre_textlen to the value of OP_INSERT
         pre_textlen += bd.textlen;
         pre_textlen -= t - oap->start_vcol;
+        oap->start_vcol = t;
+        oap->op_type = OP_INSERT;
       }
     }