diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-15 23:18:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-15 23:18:12 +0200 |
| commit | c70222d12a2f8552273c0de48a3bf7138d649175 (patch) | |
| tree | 7676051d5bb551645710064142ab3c32c17e15eb | |
| parent | fdcbe3c3fedf48a43b22938c9331addb2f1182f1 (diff) | |
patch 8.2.0986: MS-Windows: functions test failsv8.2.0986
Problem: MS-Windows: functions test fails.
Solution: Only simplify ///path on Unix.
| -rw-r--r-- | src/testdir/test_functions.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index aad5a8ce9a..d9f8b9ac03 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -464,8 +464,10 @@ func Test_simplify() call assert_equal('/', simplify('/..')) call assert_equal('/...', simplify('/...')) call assert_equal('//path', simplify('//path')) - call assert_equal('/path', simplify('///path')) - call assert_equal('/path', simplify('////path')) + if has('unix') + call assert_equal('/path', simplify('///path')) + call assert_equal('/path', simplify('////path')) + endif call assert_equal('./dir/file', './dir/file'->simplify()) call assert_equal('./dir/file', simplify('.///dir//file')) diff --git a/src/version.c b/src/version.c index e8a8b335a4..c7806bcdad 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 986, +/**/ 985, /**/ 984, |