From: Bram Moolenaar Date: Sat, 27 Aug 2016 17:52:47 +0000 (+0200) Subject: patch 7.4.2271 X-Git-Tag: v7.4.2271 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffdf08c94e16b0813862bdfdbc1c92892d2e4c93;p=vim 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 97c3e7942..910516889 100644 --- 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 097befc5f..2384d4d42 100644 --- 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, /**/