diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-27 19:52:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-27 19:52:47 +0200 |
| commit | ffdf08c94e16b0813862bdfdbc1c92892d2e4c93 (patch) | |
| tree | 9d366ac63b62b24764292511f181177bdb37a7a0 | |
| parent | 821179809d9b0f65177360b53584be2b4039dd46 (diff) | |
patch 7.4.2271v7.4.2271
Problem: Netbeans test doesn't read settings from file.
Solution: Use "-Xnbauth".
| -rw-r--r-- | src/testdir/test_netbeans.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim index 97c3e79426..910516889c 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 097befc5f4..2384d4d424 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2271, +/**/ 2270, /**/ 2269, |