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)

diff --git a/src/testdir/test_crypt.vim b/src/testdir/test_crypt.vim
index a18dfa3d17173c28cefb048fe119231381925aaf..883c899cfeb629252354941935b3be8330173eea 100644 (file)
--- 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 c2314cdf2c23d3a2e839eb09e9aeb00e8100f688..ace5a9d83a8baeb9eb7f306c328193a4af3a10e3 100644 (file)
--- 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,
 /**/