Mercurial > vim

changeset 25242:1ef6880ba4a9 v8.2.3157

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3157: crypt test may fail on MS-Windows Commit: https://github.com/vim/vim/commit/16e26a31161d65baca7885c46c43ab4a48399c92 Author: Christian Brabandt <cb@256bit.org> 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)
author Bram Moolenaar <Bram@vim.org>
date Tue, 13 Jul 2021 19:15:04 +0200
parents c565ae20db1f
children 1cbecb36d0d5
files src/testdir/test_crypt.vim src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,