patch 7.4.2108

Problem:    Netbeans test is flaky.
Solution:   Wait for the cursor to be positioned.

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 240271e7a2ee24fce6478e2929f164143c319469..97c3e794265d71f3288ffd02d40656df984de3c0 100644 (file)
--- 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 26126b8d6e45d5056c4b0b37c6be16b8b059d2d6..47417bf8fb2ac8259da8f6bd91cb3fb183756bf3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2108,
 /**/
     2107,
 /**/