To: vim_dev@googlegroups.com
Subject: Patch 8.2.3120
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3120
Problem:    Crypt with sodium test fails on MS-Windows.
Solution:   Make the tests pass. (closes #8428)
Files:      src/testdir/test_crypt.vim


*** ../vim-8.2.3119/src/testdir/test_crypt.vim	2021-06-20 14:01:25.988924596 +0200
--- src/testdir/test_crypt.vim	2021-07-08 11:36:56.465769798 +0200
***************
*** 124,129 ****
--- 124,130 ----
  
  func Test_uncrypt_xchacha20_invalid()
    CheckFeature sodium
+ 
    " load an invalid encrypted file and verify it can be decrypted with an
    " error message
    try
***************
*** 142,147 ****
--- 143,149 ----
  
  func Test_uncrypt_xchacha20_2()
    CheckFeature sodium
+ 
    sp Xcrypt_sodium.txt
    " Create a larger file, so that Vim will write in several blocks
    call setline(1, range(1,4000))
***************
*** 159,165 ****
    " successfully decrypted
    call assert_equal(range(1, 4000)->map( {_, v -> string(v)}), getline(1,'$'))
    set key=
!   w!
    " enryption removed
    call assert_match('"Xcrypt_sodium.txt" 4000L, 18893B written', execute(':message'))
    bw!
--- 161,167 ----
    " successfully decrypted
    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'))
    bw!
***************
*** 170,175 ****
--- 172,178 ----
  func Test_uncrypt_xchacha20_3_persistent_undo()
    CheckFeature sodium
    CheckFeature persistent_undo
+ 
    sp Xcrypt_sodium_undo.txt
    set cryptmethod=xchacha20 undofile
    call feedkeys(":X\<CR>sodium\<CR>sodium\<CR>", 'xt')
***************
*** 191,197 ****
    " should fail
    norm! u
    call assert_match('Already at oldest change', execute(':1mess'))
!   call assert_fails('verbose rundo' .. fnameescape(ufile), 'E822')
    bw!
    set undolevels& cryptmethod& undofile&
    call delete('Xcrypt_sodium_undo.txt')
--- 194,200 ----
    " should fail
    norm! u
    call assert_match('Already at oldest change', execute(':1mess'))
!   call assert_fails('verbose rundo ' .. fnameescape(ufile), 'E822')
    bw!
    set undolevels& cryptmethod& undofile&
    call delete('Xcrypt_sodium_undo.txt')
*** ../vim-8.2.3119/src/version.c	2021-07-07 22:13:05.136799313 +0200
--- src/version.c	2021-07-08 11:35:44.601956692 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3120,
  /**/

-- 
From "know your smileys":
 :-| :-|   Deja' vu!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///