summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-27 22:56:48 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-27 22:56:48 +0200
commitadfc5c2f9cf8032e496fcd4793d829768bd6d0a7 (patch)
treeada51f2a07e1c98fd1a22e1625d6b2656dd07a23
parentd955a0971cb4207e466ad40e78138d71052e1758 (diff)
downloadvim-git-adfc5c2f9cf8032e496fcd4793d829768bd6d0a7.tar.gz
patch 7.4.2108v7.4.2108
Problem: Netbeans test is flaky. Solution: Wait for the cursor to be positioned.
-rw-r--r--src/testdir/test_netbeans.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 240271e7a..97c3e7942 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -27,6 +27,7 @@ func Nb_basic(port)
" Opening Makefile will result in a setDot command
call WaitFor('len(readfile("Xnetbeans")) > 4')
+ call WaitFor('getcurpos()[1] == 2')
let pos = getcurpos()
call assert_equal(2, pos[1])
call assert_equal(20, pos[2])
diff --git a/src/version.c b/src/version.c
index 26126b8d6..47417bf8f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2108,
+/**/
2107,
/**/
2106,