From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 27 Jul 2016 20:56:48 +0000 (+0200)
Subject: patch 7.4.2108
X-Git-Tag: v7.4.2108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adfc5c2f9cf8032e496fcd4793d829768bd6d0a7;p=thirdparty%2Fvim.git

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 240271e7a2..97c3e79426 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 26126b8d6e..47417bf8fb 100644
--- 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,
 /**/