patch 7.4.2079

Problem:    Netbeans test fails on non-Unix systems.
Solution:   Only do the permission check on Unix systems.

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index d4791683896764e421dbe724ad570a42faadcb3e..240271e7a2ee24fce6478e2929f164143c319469 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -53,8 +53,10 @@ endfunc
 func Nb_file_auth(port)
   call assert_fails('nbstart =notexist', 'E660:')
   call writefile(['host=localhost', 'port=' . a:port, 'auth=bunny'], 'Xnbauth')
-  call setfperm('Xnbauth', "rw-r--r--")
-  call assert_fails('nbstart =Xnbauth', 'E668:')
+  if has('unix')
+    call setfperm('Xnbauth', "rw-r--r--")
+    call assert_fails('nbstart =Xnbauth', 'E668:')
+  endif
   call setfperm('Xnbauth', "rw-------")
   exe 'nbstart :localhost:' . a:port . ':bunny'
   call assert_true(has("netbeans_enabled"))

diff --git a/src/version.c b/src/version.c
index c3443fe26eee1cb984531bac45d0ad7afc4eba6f..febea0a3d46b38b70183c99a65b00ad1684dd67d 100644 (file)
--- 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 */
+/**/
+    2079,
 /**/
     2078,
 /**/