From: Bram Moolenaar Date: Tue, 8 Mar 2016 18:20:04 +0000 (+0100) Subject: patch 7.4.1521 X-Git-Tag: v7.4.1521 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8322e1f06e8fa39a6bb790a7d8d7db5d7aff3366;p=vim 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 44778ee97..0dba6a708 100644 --- 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 15baf5df9..5d7a968da 100644 --- 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, /**/