From 16e26a31161d65baca7885c46c43ab4a48399c92 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Tue, 13 Jul 2021 19:09:12 +0200 Subject: patch 8.2.3157: crypt test may fail on MS-Windows Problem: Crypt test may fail on MS-Windows. Solution: Ignore "[unix]" in the file message. (Christian Brabandt, closes #8561) --- src/testdir/test_crypt.vim | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim index a18dfa3d17..883c899cfe 100644 --- a/src/testdir/test_crypt.vim +++ b/src/testdir/test_crypt.vim @@ -162,8 +162,8 @@ func Test_uncrypt_xchacha20_2() call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$')) set key= w! ++ff=unix - " enryption removed - call assert_match('"Xcrypt_sodium.txt" 4000L, 18893B written', execute(':message')) + " enryption removed (on MS-Windows the .* matches [unix]) + call assert_match('"Xcrypt_sodium.txt".*4000L, 18893B written', execute(':message')) bw! call delete('Xcrypt_sodium.txt') set cryptmethod&vim diff --git a/src/version.c b/src/version.c index c2314cdf2c..ace5a9d83a 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 */ +/**/ + 3157, /**/ 3156, /**/ -- cgit v1.2.3