# HG changeset patch # User Christian Brabandt # Date 1472320807 -7200 # Node ID c2968473c8dc19597f5637ba79f67ac9b8959ae1 # Parent 6c4c8554bf5af9b5a781814766533142be832087 commit https://github.com/vim/vim/commit/ffdf08c94e16b0813862bdfdbc1c92892d2e4c93 Author: Bram Moolenaar Date: Sat Aug 27 19:52:47 2016 +0200 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 --- 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 --- 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,