To: vim_dev@googlegroups.com
Subject: Patch 8.2.3102
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.3102 (after 8.2.3097)
Problem:    Test for crash fix does not fail without the fix.
Solution:   Adjust the test sequence. (closes #8506)
Files:      src/testdir/test_swap.vim


*** ../vim-8.2.3101/src/testdir/test_swap.vim	2021-07-04 13:27:05.968932388 +0200
--- src/testdir/test_swap.vim	2021-07-04 17:14:49.952490713 +0200
***************
*** 373,390 ****
    call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))})
    call StopVimInTerminal(buf)
  
!   " This caused Vim to crash when typing "q".
!   " TODO: it does not actually reproduce the crash.
!   call writefile(['au BufAdd * set virtualedit=all'], 'Xvimrc')
! 
!   let buf = RunVimInTerminal('-u Xvimrc Xfile1', {'rows': 20, 'wait_for_ruler': 0})
!   call TermWait(buf)
!   call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 20))})
    call term_sendkeys(buf, "q")
  
    %bwipe!
    call delete('Xfile1')
-   call delete('Xvimrc')
  endfunc
  
  func Test_swap_symlink()
--- 373,394 ----
    call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))})
    call StopVimInTerminal(buf)
  
!   " This caused Vim to crash when typing "q" at the swap file prompt.
!   let buf = RunVimInTerminal('-c "au bufadd * let foo_w = wincol()"', {'rows': 18})
!   call term_sendkeys(buf, ":e Xfile1\<CR>")
!   call WaitForAssert({-> assert_match('More', term_getline(buf, 18))})
!   call term_sendkeys(buf, " ")
!   call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 18))})
    call term_sendkeys(buf, "q")
+   call TermWait(buf)
+   " check that Vim is still running
+   call term_sendkeys(buf, ":echo 'hello'\<CR>")
+   call WaitForAssert({-> assert_match('^hello', term_getline(buf, 18))})
+   call term_sendkeys(buf, ":%bwipe!\<CR>")
+   call StopVimInTerminal(buf)
  
    %bwipe!
    call delete('Xfile1')
  endfunc
  
  func Test_swap_symlink()
*** ../vim-8.2.3101/src/version.c	2021-07-04 17:19:32.371800400 +0200
--- src/version.c	2021-07-04 17:22:42.103350299 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3102,
  /**/

-- 
From "know your smileys":
 :-O>-o   Smiley American tourist (note big mouth and camera)

 /// 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    ///