# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1572489003 -3600
# Node ID 26256dcadd7705d2602e2959049ce86a1e717245
# Parent  974699057771e07b1534589cbd5fa3ce79771cde
patch 8.1.2235: "C" with 'virtualedit' set does not include multi-byte char

Commit: https://github.com/vim/vim/commit/77ccc00340ed2598f7aa09716217e878665964fa
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Oct 31 03:21:25 2019 +0100

    patch 8.1.2235: "C" with 'virtualedit' set does not include multi-byte char

    Problem:    "C" with 'virtualedit' set does not include multi-byte char.
    Solution:   Include the whole multi-byte char. (Nobuhiro Takasaki,
                closes #5152)

diff --git a/src/ops.c b/src/ops.c
--- a/src/ops.c
+++ b/src/ops.c
@@ -912,6 +912,8 @@ op_delete(oparg_T *oap)
 		oap->end = curwin->w_cursor;
 		curwin->w_cursor = oap->start;
 	    }
+	    if (has_mbyte)
+		mb_adjust_opend(oap);
 	}
 
 	if (oap->line_count == 1)	/* delete characters within one line */
diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim
--- a/src/testdir/test_virtualedit.vim
+++ b/src/testdir/test_virtualedit.vim
@@ -73,3 +73,12 @@ func Test_edit_CTRL_G()
   bwipe!
   set virtualedit=
 endfunc
+
+func Test_edit_change()
+  new
+  set virtualedit=all
+  call setline(1, "\t⒌")
+  normal Cx
+  call assert_equal('x', getline(1))
+  bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2235,
+/**/
     2234,
 /**/
     2233,