patch 7.4.1521

Problem:    File permission test fails on MS-Windows.
Solution:   Expect a different permission.

diff --git a/src/testdir/test_file_perm.vim b/src/testdir/test_file_perm.vim
index 44778ee972b84a51e72b7c37359f9e0d7d9458c8..0dba6a708ac66f5b46dd839f7513e1b63bc73d79 100644 (file)
--- a/src/testdir/test_file_perm.vim
+++ b/src/testdir/test_file_perm.vim
@@ -8,7 +8,11 @@ func Test_file_perm()
   call assert_true(len(getfperm('Xtest')) == 9)
 
   call assert_equal(1, setfperm('Xtest', 'rwx------'))
-  call assert_equal('rwx------', getfperm('Xtest'))
+  if has('win32')
+    call assert_equal('rw-rw-rw-', getfperm('Xtest'))
+  else
+    call assert_equal('rwx------', getfperm('Xtest'))
+  endif
 
   call assert_equal(1, setfperm('Xtest', 'r--r--r--'))
   call assert_equal('r--r--r--', getfperm('Xtest'))

diff --git a/src/version.c b/src/version.c
index 15baf5df9d6863b82c0f2504d4ebe96fd0bf512f..5d7a968da0c90c4bef4c87e6d1fb323b4affd682 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1521,
 /**/
     1520,
 /**/