summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_crypt.vim4
-rw-r--r--src/version.c2
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
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3157,
+/**/
3156,
/**/
3155,