updated for version 7.3.1200
Problem: When calling setline() from Insert mode, using CTRL-R =, undo does
not work properly. (Israel Chauca)
Solution: Sync undo after evaluating the expression. (Christian Brabandt)
diff --git a/src/edit.c b/src/edit.c
index 4eab20e..413740f 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8126,10 +8126,8 @@
--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 @@
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 8883163..2602e97 100644
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -84,6 +84,16 @@
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 6e25e3b..0e3a525 100644
--- a/src/testdir/test61.ok
+++ b/src/testdir/test61.ok
@@ -41,3 +41,6 @@
two
two
three
+
+a
+b
diff --git a/src/version.c b/src/version.c
index 9e98379..bb9edce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1200,
+/**/
1199,
/**/
1198,
