From c70222d12a2f8552273c0de48a3bf7138d649175 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 15 Jun 2020 23:18:12 +0200 Subject: patch 8.2.0986: MS-Windows: functions test fails Problem: MS-Windows: functions test fails. Solution: Only simplify ///path on Unix. --- src/testdir/test_functions.vim | 6 ++++-- 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 @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 986, /**/ 985, /**/ -- cgit v1.2.3