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 4eab20eb6b493f8fc0ec70813cd5a8ed1f0e028a..413740f70d10acbc1dcfe4925a12d4be3f9e2946 100644 (file)
--- 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 88831636ae375c63df32e8ad63825a7e60bf841c..2602e97597494c073e65c9eccc96f2bea282e51e 100644 (file)
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -84,6 +84,16 @@ ggO---\e:0put c
 ggO---\e:0put b
 ggO---\e:0put a
 ggO---\e:w >>test.out
+:so small.vim
+:set nocp
+:enew!
+oa\e
+:set ul=100
+ob\e
+:set ul=100
+o1\ea2\12=setline('.','1234')
+
+\euu:%w >>test.out
 :qa!
 ENDTEST
 

diff --git a/src/testdir/test61.ok b/src/testdir/test61.ok
index 6e25e3bfd76b48fe8fa2852e9ba15d71dcd20e5a..0e3a52508842b2e35fd5ab33f8c46bdf3db32c59 100644 (file)
--- 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 9e98379f9e35c98d0036d6c408ff5b3598fa6173..bb9edce1f4ff2d9a285d6a35b1d5f5f7e8a9d619 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1200,
 /**/
     1199,
 /**/