patch 7.4.2271

Problem:    Netbeans test doesn't read settings from file.
Solution:   Use "-Xnbauth".

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 97c3e794265d71f3288ffd02d40656df984de3c0..910516889c9e93d82bb8bdc668a6d6a47ad65bb9 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -59,7 +59,7 @@ func Nb_file_auth(port)
     call assert_fails('nbstart =Xnbauth', 'E668:')
   endif
   call setfperm('Xnbauth', "rw-------")
-  exe 'nbstart :localhost:' . a:port . ':bunny'
+  exe 'nbstart =Xnbauth'
   call assert_true(has("netbeans_enabled"))
 
   call WaitFor('len(readfile("Xnetbeans")) > 2')

diff --git a/src/version.c b/src/version.c
index 097befc5f4c11bbb9aeaf7f5c85510fa057bb8b4..2384d4d42451778eab4cb99e90885f452a9ba392 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2271,
 /**/
     2270,
 /**/