diff options
| -rw-r--r-- | src/edit.c | 9 | ||||
| -rw-r--r-- | src/testdir/test61.in | 10 | ||||
| -rw-r--r-- | src/testdir/test61.ok | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 20 insertions, 4 deletions
diff --git a/src/edit.c b/src/edit.c index 4eab20eb6..413740f70 100644 --- a/src/edit.c +++ b/src/edit.c @@ -8126,10 +8126,8 @@ ins_reg() --no_mapping; #ifdef FEAT_EVAL - /* - * Don't call u_sync() while getting the expression, - * evaluating it or giving an error message for it! - */ + /* Don't call u_sync() while typing the expression or giving an error + * message for it. Only call it explicitly. */ ++no_u_sync; if (regname == '=') { @@ -8142,6 +8140,9 @@ ins_reg() if (im_on) im_set_active(TRUE); # endif + if (regname == '=') + /* sync undo, so the effect of e.g., setline() can be undone */ + u_sync(TRUE); } if (regname == NUL || !valid_yank_reg(regname, FALSE)) { diff --git a/src/testdir/test61.in b/src/testdir/test61.in index 88831636a..2602e9759 100644 --- a/src/testdir/test61.in +++ b/src/testdir/test61.in @@ -84,6 +84,16 @@ ggO---:0put c ggO---:0put b ggO---:0put a ggO---:w >>test.out +:so small.vim +:set nocp +:enew! +oa +:set ul=100 +ob +:set ul=100 +o1a2=setline('.','1234') + +uu:%w >>test.out :qa! ENDTEST diff --git a/src/testdir/test61.ok b/src/testdir/test61.ok index 6e25e3bfd..0e3a52508 100644 --- a/src/testdir/test61.ok +++ b/src/testdir/test61.ok @@ -41,3 +41,6 @@ one one one two two three + +a +b diff --git a/src/version.c b/src/version.c index 9e98379f9..bb9edce1f 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1200, +/**/ 1199, /**/ 1198, |