diff options
| -rw-r--r-- | src/optionstr.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_virtualedit.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/optionstr.c b/src/optionstr.c index 29f7f87ce..0eb9f5b74 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -2078,7 +2078,7 @@ did_set_string_option( { if (opt_strings_flags(ve, p_ve_values, flags, TRUE) != OK) errmsg = e_invalid_argument; - else if (STRCMP(p_ve, oldval) != 0) + else if (STRCMP(ve, oldval) != 0) { // Recompute cursor position in case the new 've' setting // changes something. diff --git a/src/testdir/test_virtualedit.vim b/src/testdir/test_virtualedit.vim index 8ca81a777..7ad54db2f 100644 --- a/src/testdir/test_virtualedit.vim +++ b/src/testdir/test_virtualedit.vim @@ -537,6 +537,19 @@ func Test_global_local_virtualedit() set virtualedit& endfunc +func Test_virtualedit_setlocal() + enew + setglobal virtualedit=all + setlocal virtualedit=all + normal! l + redraw + setlocal virtualedit=none + call assert_equal(1, wincol()) + + setlocal virtualedit& + set virtualedit& +endfunc + func Test_virtualedit_mouse() let save_mouse = &mouse set mouse=a diff --git a/src/version.c b/src/version.c index a6534c209..b99641f5b 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1255, +/**/ 1254, /**/ 1253, |