# HG changeset patch # User Bram Moolenaar # Date 1626196504 -7200 # Node ID 1ef6880ba4a9193006825fe378108538a0c4652f # Parent c565ae20db1fa771663e52618c56c8d093c8d162 patch 8.2.3157: crypt test may fail on MS-Windows Commit: https://github.com/vim/vim/commit/16e26a31161d65baca7885c46c43ab4a48399c92 Author: Christian Brabandt Date: Tue Jul 13 19:09:12 2021 +0200 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 --- 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 --- 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,