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

Patch 9.0.0625
Problem:    Too many delete() calls in tests.
Solution:   Use deferred delete where possible.
Files:      src/testdir/test_popup.vim, src/testdir/test_iminsert.vim,
            src/testdir/test_indent.vim, src/testdir/test_ins_complete.vim,
            src/testdir/test_jumplist.vim, src/testdir/test_lambda.vim,
            src/testdir/test_let.vim, src/testdir/test_listchars.vim,
            src/testdir/test_lua.vim


*** ../vim-9.0.0624/src/testdir/test_popup.vim	2022-07-26 12:24:38.242801624 +0100
--- src/testdir/test_popup.vim	2022-09-29 20:43:24.477122801 +0100
***************
*** 758,764 ****
      call setline(1, map(repeat(["ab"], 10), "v:val .. v:key"))
      exec "norm! G\<C-E>\<C-E>"
    END
!   call writefile(lines, 'Xscript')
    let buf = RunVimInTerminal('-S Xscript', {})
  
    " wait for the script to finish
--- 758,764 ----
      call setline(1, map(repeat(["ab"], 10), "v:val .. v:key"))
      exec "norm! G\<C-E>\<C-E>"
    END
!   call writefile(lines, 'Xscript', 'D')
    let buf = RunVimInTerminal('-S Xscript', {})
  
    " wait for the script to finish
***************
*** 772,778 ****
  
    call term_sendkeys(buf, "\<Esc>u")
    call StopVimInTerminal(buf)
-   call delete('Xscript')
  endfunc
  
  func Test_balloon_split()
--- 772,777 ----
***************
*** 829,835 ****
      123456789_123456789_123456789_b
                  123
    END
!   call writefile(lines, 'Xtest')
    let buf = RunVimInTerminal('Xtest', {})
    call term_sendkeys(buf, ":vsplit\<CR>")
  
--- 828,834 ----
      123456789_123456789_123456789_b
                  123
    END
!   call writefile(lines, 'Xtest', 'D')
    let buf = RunVimInTerminal('Xtest', {})
    call term_sendkeys(buf, ":vsplit\<CR>")
  
***************
*** 860,866 ****
    
    call term_sendkeys(buf, "\<Esc>u")
    call StopVimInTerminal(buf)
-   call delete('Xtest')
  endfunc
  
  func Test_popup_command()
--- 859,864 ----
***************
*** 883,896 ****
        echomsg 'changed'
      endfunc
    END
!   call writefile(script, 'XtimerScript')
  
    let lines =<< trim END
  	one two three four five
  	and one two Xthree four five
  	one more two three four five
    END
!   call writefile(lines, 'Xtest')
    let buf = RunVimInTerminal('-S XtimerScript Xtest', {})
    call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
    call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")
--- 881,894 ----
        echomsg 'changed'
      endfunc
    END
!   call writefile(script, 'XtimerScript', 'D')
  
    let lines =<< trim END
  	one two three four five
  	and one two Xthree four five
  	one more two three four five
    END
!   call writefile(lines, 'Xtest', 'D')
    let buf = RunVimInTerminal('-S XtimerScript Xtest', {})
    call term_sendkeys(buf, ":source $VIMRUNTIME/menu.vim\<CR>")
    call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>")
***************
*** 917,924 ****
    call VerifyScreenDump(buf, 'Test_popup_command_05', {})
  
    call StopVimInTerminal(buf)
-   call delete('Xtest')
-   call delete('XtimerScript')
  endfunc
  
  func Test_popup_complete_backwards()
--- 915,920 ----
***************
*** 1013,1019 ****
    inoremap <buffer><F6> <C-R>=s:complTestEval()<CR>
    call writefile([
          \ 'dummy	dummy.txt	1',
!         \], 'Xdummy.txt')
    setlocal tags=Xdummy.txt
    setlocal dictionary=Xdummy.txt
    setlocal thesaurus=Xdummy.txt
--- 1009,1015 ----
    inoremap <buffer><F6> <C-R>=s:complTestEval()<CR>
    call writefile([
          \ 'dummy	dummy.txt	1',
!         \], 'Xdummy.txt', 'D')
    setlocal tags=Xdummy.txt
    setlocal dictionary=Xdummy.txt
    setlocal thesaurus=Xdummy.txt
***************
*** 1046,1052 ****
      call assert_equal(mode_name, getline('.'))
      %d
    endfor
!   call delete('Xdummy.txt')
    bwipe!
  endfunc
  
--- 1042,1048 ----
      call assert_equal(mode_name, getline('.'))
      %d
    endfor
! 
    bwipe!
  endfunc
  
***************
*** 1194,1200 ****
      vim
      victory
    END
!   call writefile(lines, 'Xtest1')
    let buf = RunVimInTerminal('--cmd "set rightleft" Xtest1', {})
    call term_sendkeys(buf, "Go\<C-P>")
    call VerifyScreenDump(buf, 'Test_pum_rightleft_01', {'rows': 8})
--- 1190,1196 ----
      vim
      victory
    END
!   call writefile(lines, 'Xtest1', 'D')
    let buf = RunVimInTerminal('--cmd "set rightleft" Xtest1', {})
    call term_sendkeys(buf, "Go\<C-P>")
    call VerifyScreenDump(buf, 'Test_pum_rightleft_01', {'rows': 8})
***************
*** 1209,1215 ****
      one	three
      four
    END
!   call writefile(lines, 'Xtest2')
    call term_sendkeys(buf, "\<Esc>:e! Xtest2\<CR>")
    call TermWait(buf, 30)
    call term_sendkeys(buf, "Goone\<C-X>\<C-L>")
--- 1205,1211 ----
      one	three
      four
    END
!   call writefile(lines, 'Xtest2', 'D')
    call term_sendkeys(buf, "\<Esc>:e! Xtest2\<CR>")
    call TermWait(buf, 30)
    call term_sendkeys(buf, "Goone\<C-X>\<C-L>")
***************
*** 1222,1229 ****
    call WaitForAssert({-> assert_match('\s*eerht     eno', Screenline(4))})
  
    call StopVimInTerminal(buf)
-   call delete('Xtest1')
-   call delete('Xtest2')
  endfunc
  
  " Test for a popup menu with a scrollbar
--- 1218,1223 ----
***************
*** 1234,1240 ****
      two
      three
    END
!   call writefile(lines, 'Xtest1')
    let buf = RunVimInTerminal('--cmd "set pumheight=2" Xtest1', {})
    call TermWait(buf)
    call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>")
--- 1228,1234 ----
      two
      three
    END
!   call writefile(lines, 'Xtest1', 'D')
    let buf = RunVimInTerminal('--cmd "set pumheight=2" Xtest1', {})
    call TermWait(buf)
    call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>")
***************
*** 1250,1256 ****
    endif
  
    call StopVimInTerminal(buf)
-   call delete('Xtest1')
  endfunc
  
  " vim: shiftwidth=2 sts=2 expandtab
--- 1244,1249 ----
*** ../vim-9.0.0624/src/testdir/test_iminsert.vim	2022-06-21 16:24:56.000000000 +0100
--- src/testdir/test_iminsert.vim	2022-09-29 20:46:17.304775940 +0100
***************
*** 79,85 ****
      call setline(1, ['{{{', 'abc', '}}}'])
      %foldclose
    END
!   call writefile(lines, 'Xscript')
    let buf = RunVimInTerminal('-S Xscript', {})
    call assert_notequal('abc', term_getline(buf, 2))
    call term_sendkeys(buf, "/abc\n")
--- 79,85 ----
      call setline(1, ['{{{', 'abc', '}}}'])
      %foldclose
    END
!   call writefile(lines, 'Xscript', 'D')
    let buf = RunVimInTerminal('-S Xscript', {})
    call assert_notequal('abc', term_getline(buf, 2))
    call term_sendkeys(buf, "/abc\n")
***************
*** 87,93 ****
  
    " clean up
    call StopVimInTerminal(buf)
-   call delete('Xscript')
  endfunc
  
  " Test for using an lmap in insert mode
--- 87,92 ----
*** ../vim-9.0.0624/src/testdir/test_indent.vim	2022-09-02 21:55:45.503049444 +0100
--- src/testdir/test_indent.vim	2022-09-29 20:46:35.700739632 +0100
***************
*** 161,167 ****
    func GetIndent()
      return line('.') * 2
    endfunc
!   call writefile(['# vim: indentexpr=GetIndent()'], 'Xmlfile.txt')
    set modelineexpr
    new Xmlfile.txt
    call assert_equal('GetIndent()', &indentexpr)
--- 161,167 ----
    func GetIndent()
      return line('.') * 2
    endfunc
!   call writefile(['# vim: indentexpr=GetIndent()'], 'Xmlfile.txt', 'D')
    set modelineexpr
    new Xmlfile.txt
    call assert_equal('GetIndent()', &indentexpr)
***************
*** 172,178 ****
    delfunc GetIndent
    let &modeline = modeline
    close!
-   call delete('Xmlfile.txt')
  endfunc
  
  func Test_indent_func_with_gq()
--- 172,177 ----
*** ../vim-9.0.0624/src/testdir/test_ins_complete.vim	2022-09-24 19:20:26.575649263 +0100
--- src/testdir/test_ins_complete.vim	2022-09-29 20:50:57.780231664 +0100
***************
*** 15,28 ****
    set ff=unix
    call writefile(["test11\t36Gepeto\t/Tag/",
  	      \ "asd\ttest11file\t36G",
! 	      \ "Makefile\tto\trun"], 'Xtestfile')
    call writefile(['', 'start of testfile',
  	      \ 'ru',
  	      \ 'run1',
  	      \ 'run2',
  	      \ 'STARTTEST',
  	      \ 'ENDTEST',
! 	      \ 'end of testfile'], 'Xtestdata')
    set ff&
  
    enew!
--- 15,28 ----
    set ff=unix
    call writefile(["test11\t36Gepeto\t/Tag/",
  	      \ "asd\ttest11file\t36G",
! 	      \ "Makefile\tto\trun"], 'Xtestfile', 'D')
    call writefile(['', 'start of testfile',
  	      \ 'ru',
  	      \ 'run1',
  	      \ 'run2',
  	      \ 'STARTTEST',
  	      \ 'ENDTEST',
! 	      \ 'end of testfile'], 'Xtestdata', 'D')
    set ff&
  
    enew!
***************
*** 99,108 ****
    call assert_equal('asd', getline('.'))
  
    %bw!
-   call delete('Xtestfile')
    call delete('Xtest11.one')
    call delete('Xtest11.two')
-   call delete('Xtestdata')
    set cpt& cot& def& tags& tagbsearch& hidden&
    cd ..
    call delete('Xcpldir', 'rf')
--- 99,106 ----
***************
*** 111,123 ****
  func Test_ins_complete_invalid_byte()
    if has('unix') && executable('base64')
      " this weird command was causing an illegal memory access
!     call writefile(['bm9ybTlvMDCAMM4Dbw4OGA4ODg=='], 'Xinvalid64')
      call system('base64 -d Xinvalid64 > Xinvalid')
!     call writefile(['qa!'], 'Xexit')
      call RunVim([], [], " -i NONE -n -X -Z -e -m -s -S Xinvalid -S Xexit")
-     call delete('Xinvalid64')
      call delete('Xinvalid')
-     call delete('Xexit')
    endif
  endfunc
  
--- 109,119 ----
  func Test_ins_complete_invalid_byte()
    if has('unix') && executable('base64')
      " this weird command was causing an illegal memory access
!     call writefile(['bm9ybTlvMDCAMM4Dbw4OGA4ODg=='], 'Xinvalid64', 'D')
      call system('base64 -d Xinvalid64 > Xinvalid')
!     call writefile(['qa!'], 'Xexit', 'D')
      call RunVim([], [], " -i NONE -n -X -Z -e -m -s -S Xinvalid -S Xexit")
      call delete('Xinvalid')
    endif
  endfunc
  
***************
*** 168,174 ****
    let save_rtp = &rtp
    set rtp=Xruntime/some
    let dir = 'Xruntime/some/autoload'
!   call mkdir(dir, 'p')
  
    let lines =<< trim END
        vim9script
--- 164,170 ----
    let save_rtp = &rtp
    set rtp=Xruntime/some
    let dir = 'Xruntime/some/autoload'
!   call mkdir(dir, 'pR')
  
    let lines =<< trim END
        vim9script
***************
*** 190,196 ****
    call feedkeys("i\<C-X>\<C-O>\<Esc>", 'xt')
  
    bwipe!
-   call delete('Xruntime', 'rf')
    set omnifunc=
    let &rtp = save_rtp
  endfunc
--- 186,191 ----
***************
*** 433,439 ****
  func Test_ins_completeslash()
    CheckMSWindows
  
!   call mkdir('Xcpldir')
    let orig_shellslash = &shellslash
    set cpt&
    new
--- 428,434 ----
  func Test_ins_completeslash()
    CheckMSWindows
  
!   call mkdir('Xcpldir', 'R')
    let orig_shellslash = &shellslash
    set cpt&
    new
***************
*** 466,472 ****
    exe "normal oXcp\<C-X>\<C-F>"
    call assert_equal('Xcpldir/', getline('.'))
    %bw!
-   call delete('Xcpldir', 'rf')
  
    set noshellslash
    set completeslash=slash
--- 461,466 ----
***************
*** 487,493 ****
      endfunc
    END
  
!   call writefile(lines, 'Xpumscript')
    let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12})
    call term_sendkeys(buf, ":call StartCompl()\<CR>")
    call TermWait(buf, 200)
--- 481,487 ----
      endfunc
    END
  
!   call writefile(lines, 'Xpumscript', 'D')
    let buf = RunVimInTerminal('-S Xpumscript', #{rows: 12})
    call term_sendkeys(buf, ":call StartCompl()\<CR>")
    call TermWait(buf, 200)
***************
*** 495,501 ****
    call VerifyScreenDump(buf, 'Test_pum_stopped_by_timer', {})
  
    call StopVimInTerminal(buf)
-   call delete('Xpumscript')
  endfunc
  
  func Test_complete_stopinsert_startinsert()
--- 489,494 ----
***************
*** 520,526 ****
      call feedkeys("0fa", 'xt')
    END
  
!   call writefile(lines, 'Xpumscript')
    let buf = RunVimInTerminal('-S Xpumscript', #{rows: 10})
    call TermWait(buf, 50)
    call term_sendkeys(buf, "a\<C-N>")
--- 513,519 ----
      call feedkeys("0fa", 'xt')
    END
  
!   call writefile(lines, 'Xpumscript', 'D')
    let buf = RunVimInTerminal('-S Xpumscript', #{rows: 10})
    call TermWait(buf, 50)
    call term_sendkeys(buf, "a\<C-N>")
***************
*** 528,534 ****
  
    call term_sendkeys(buf, "\<Esc>")
    call StopVimInTerminal(buf)
-   call delete('Xpumscript')
  endfunc
  
  func Test_pum_with_preview_win()
--- 521,526 ----
***************
*** 545,551 ****
        set completeopt+=longest
    END
  
!   call writefile(lines, 'Xpreviewscript')
    let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
    call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
    call TermWait(buf, 200)
--- 537,543 ----
        set completeopt+=longest
    END
  
!   call writefile(lines, 'Xpreviewscript', 'D')
    let buf = RunVimInTerminal('-S Xpreviewscript', #{rows: 12})
    call term_sendkeys(buf, "Gi\<C-X>\<C-O>")
    call TermWait(buf, 200)
***************
*** 554,560 ****
  
    call term_sendkeys(buf, "\<Esc>")
    call StopVimInTerminal(buf)
-   call delete('Xpreviewscript')
  endfunc
  
  func Test_scrollbar_on_wide_char()
--- 546,551 ----
***************
*** 566,578 ****
                          \ '              呃呃呃'])
      call setline(5, range(10)->map({i, v -> 'aa' .. v .. 'bb'}))
    END
!   call writefile(lines, 'Xwidescript')
    let buf = RunVimInTerminal('-S Xwidescript', #{rows: 10})
    call term_sendkeys(buf, "A\<C-N>")
    call VerifyScreenDump(buf, 'Test_scrollbar_on_wide_char', {})
  
    call StopVimInTerminal(buf)
-   call delete('Xwidescript')
  endfunc
  
  " Test for inserting the tag search pattern in insert mode
--- 557,568 ----
                          \ '              呃呃呃'])
      call setline(5, range(10)->map({i, v -> 'aa' .. v .. 'bb'}))
    END
!   call writefile(lines, 'Xwidescript', 'D')
    let buf = RunVimInTerminal('-S Xwidescript', #{rows: 10})
    call term_sendkeys(buf, "A\<C-N>")
    call VerifyScreenDump(buf, 'Test_scrollbar_on_wide_char', {})
  
    call StopVimInTerminal(buf)
  endfunc
  
  " Test for inserting the tag search pattern in insert mode
***************
*** 582,595 ****
          \ "first\tXfoo\t/^int first() {}$/",
          \ "second\tXfoo\t/^int second() {}$/",
          \ "third\tXfoo\t/^int third() {}$/"],
!         \ 'Xtags')
    set tags=Xtags
    let code =<< trim [CODE]
      int first() {}
      int second() {}
      int third() {}
    [CODE]
!   call writefile(code, 'Xfoo')
  
    enew
    set showfulltag
--- 572,585 ----
          \ "first\tXfoo\t/^int first() {}$/",
          \ "second\tXfoo\t/^int second() {}$/",
          \ "third\tXfoo\t/^int third() {}$/"],
!         \ 'Xtags', 'D')
    set tags=Xtags
    let code =<< trim [CODE]
      int first() {}
      int second() {}
      int third() {}
    [CODE]
!   call writefile(code, 'Xfoo', 'D')
  
    enew
    set showfulltag
***************
*** 597,604 ****
    call assert_equal('int second() {}', getline(1))
    set noshowfulltag
  
-   call delete('Xtags')
-   call delete('Xfoo')
    set tags&
    %bwipe!
  endfunc
--- 587,592 ----
***************
*** 978,985 ****
  
  " Test for completing words from unloaded buffers
  func Test_complete_from_unloadedbuf()
!   call writefile(['abc'], "Xfile1")
!   call writefile(['def'], "Xfile2")
    edit Xfile1
    edit Xfile2
    new | close
--- 966,973 ----
  
  " Test for completing words from unloaded buffers
  func Test_complete_from_unloadedbuf()
!   call writefile(['abc'], "Xfile1", 'D')
!   call writefile(['def'], "Xfile2", 'D')
    edit Xfile1
    edit Xfile2
    new | close
***************
*** 991,1005 ****
    call assert_equal('abc', getline(1))
    exe "normal! od\<C-P>"
    call assert_equal('def', getline(2))
    set complete&
    %bw!
-   call delete("Xfile1")
-   call delete("Xfile2")
  endfunc
  
  " Test for completing whole lines from unloaded buffers
  func Test_complete_wholeline_unloadedbuf()
!   call writefile(['a line1', 'a line2', 'a line3'], "Xfile1")
    edit Xfile1
    enew
    set complete=u
--- 979,992 ----
    call assert_equal('abc', getline(1))
    exe "normal! od\<C-P>"
    call assert_equal('def', getline(2))
+ 
    set complete&
    %bw!
  endfunc
  
  " Test for completing whole lines from unloaded buffers
  func Test_complete_wholeline_unloadedbuf()
!   call writefile(['a line1', 'a line2', 'a line3'], "Xfile1", 'D')
    edit Xfile1
    enew
    set complete=u
***************
*** 1010,1024 ****
    bdel Xfile1
    exe "normal! ia\<C-X>\<C-L>\<C-P>"
    call assert_equal('a', getline(1))
    set complete&
    %bw!
-   call delete("Xfile1")
  endfunc
  
  " Test for completing words from unlisted buffers
  func Test_complete_from_unlistedbuf()
!   call writefile(['abc'], "Xfile1")
!   call writefile(['def'], "Xfile2")
    edit Xfile1
    edit Xfile2
    new | close
--- 997,1011 ----
    bdel Xfile1
    exe "normal! ia\<C-X>\<C-L>\<C-P>"
    call assert_equal('a', getline(1))
+ 
    set complete&
    %bw!
  endfunc
  
  " Test for completing words from unlisted buffers
  func Test_complete_from_unlistedbuf()
!   call writefile(['abc'], "Xfile1", 'D')
!   call writefile(['def'], "Xfile2", 'D')
    edit Xfile1
    edit Xfile2
    new | close
***************
*** 1029,1043 ****
    call assert_equal('abc', getline(1))
    exe "normal! od\<C-P>"
    call assert_equal('def', getline(2))
    set complete&
    %bw!
-   call delete("Xfile1")
-   call delete("Xfile2")
  endfunc
  
  " Test for completing whole lines from unlisted buffers
  func Test_complete_wholeline_unlistedbuf()
!   call writefile(['a line1', 'a line2', 'a line3'], "Xfile1")
    edit Xfile1
    enew
    set complete=U
--- 1016,1029 ----
    call assert_equal('abc', getline(1))
    exe "normal! od\<C-P>"
    call assert_equal('def', getline(2))
+ 
    set complete&
    %bw!
  endfunc
  
  " Test for completing whole lines from unlisted buffers
  func Test_complete_wholeline_unlistedbuf()
!   call writefile(['a line1', 'a line2', 'a line3'], "Xfile1", 'D')
    edit Xfile1
    enew
    set complete=U
***************
*** 1048,1056 ****
    bdel Xfile1
    exe "normal! ia\<C-X>\<C-L>\<C-P>"
    call assert_equal('a line2', getline(1))
    set complete&
    %bw!
-   call delete("Xfile1")
  endfunc
  
  " Test for adding a multibyte character using CTRL-L in completion mode
--- 1034,1042 ----
    bdel Xfile1
    exe "normal! ia\<C-X>\<C-L>\<C-P>"
    call assert_equal('a line2', getline(1))
+ 
    set complete&
    %bw!
  endfunc
  
  " Test for adding a multibyte character using CTRL-L in completion mode
***************
*** 1246,1259 ****
    CheckUnix
    CheckNotRoot
  
!   call writefile(['about', 'above'], 'Xunrfile')
    call setfperm('Xunrfile', '---r--r--')
    new
    set complete=sXfile
    exe "normal! ia\<C-P>"
    call assert_equal('a', getline(1))
    bw!
-   call delete('Xunrfile')
    set complete&
  endfunc
  
--- 1232,1245 ----
    CheckUnix
    CheckNotRoot
  
!   call writefile(['about', 'above'], 'Xunrfile', 'D')
    call setfperm('Xunrfile', '---r--r--')
    new
    set complete=sXfile
    exe "normal! ia\<C-P>"
    call assert_equal('a', getline(1))
+ 
    bw!
    set complete&
  endfunc
  
*** ../vim-9.0.0624/src/testdir/test_jumplist.vim	2022-04-09 13:25:14.000000000 +0100
--- src/testdir/test_jumplist.vim	2022-09-29 20:51:18.692191748 +0100
***************
*** 15,21 ****
    for i in range(1, 100)
      call add(lines, "Line " . i)
    endfor
!   call writefile(lines, "Xtest")
  
    " Jump around and create a jump list
    edit Xtest
--- 15,21 ----
    for i in range(1, 100)
      call add(lines, "Line " . i)
    endfor
!   call writefile(lines, "Xtest", 'D')
  
    " Jump around and create a jump list
    edit Xtest
***************
*** 57,64 ****
    clearjumps
    call test_garbagecollect_now()
    call assert_equal(4, l[1])
- 
-   call delete("Xtest")
  endfunc
  
  func Test_jumplist_invalid()
--- 57,62 ----
*** ../vim-9.0.0624/src/testdir/test_lambda.vim	2022-09-18 13:06:36.461124371 +0100
--- src/testdir/test_lambda.vim	2022-09-29 20:52:08.628096692 +0100
***************
*** 354,360 ****
        return 1
      endfunc
    END
!   call writefile(l, 'Xscript')
    let caught_932 = 0
    try
      source Xscript
--- 354,360 ----
        return 1
      endfunc
    END
!   call writefile(l, 'Xscript', 'D')
    let caught_932 = 0
    try
      source Xscript
***************
*** 362,368 ****
      let caught_932 = 1
    endtry
    call assert_equal(1, caught_932)
-   call delete('Xscript')
  endfunc
  
  " vim: shiftwidth=2 sts=2 expandtab
--- 362,367 ----
*** ../vim-9.0.0624/src/testdir/test_let.vim	2022-09-02 11:25:34.074117570 +0100
--- src/testdir/test_let.vim	2022-09-29 20:53:05.823988304 +0100
***************
*** 344,379 ****
      let v =<< that there
    endfunc
    END
!   call writefile(text, 'XheredocFail')
    call assert_fails('source XheredocFail', 'E1145:')
-   call delete('XheredocFail')
  
    let text =<< trim CodeEnd
    func MissingEnd()
      let v =<< END
    endfunc
    CodeEnd
!   call writefile(text, 'XheredocWrong')
    call assert_fails('source XheredocWrong', 'E1145:')
-   call delete('XheredocWrong')
  
    let text =<< trim TEXTend
      let v =<< " comment
    TEXTend
!   call writefile(text, 'XheredocNoMarker')
    call assert_fails('source XheredocNoMarker', 'E172:')
-   call delete('XheredocNoMarker')
  
    let text =<< trim TEXTend
      let v =<< text
    TEXTend
!   call writefile(text, 'XheredocBadMarker')
    call assert_fails('source XheredocBadMarker', 'E221:')
-   call delete('XheredocBadMarker')
  
!   call writefile(['let v =<< TEXT', 'abc'], 'XheredocMissingMarker')
    call assert_fails('source XheredocMissingMarker', 'E990:')
-   call delete('XheredocMissingMarker')
  endfunc
  
  func Test_let_heredoc_trim_no_indent_marker()
--- 344,374 ----
      let v =<< that there
    endfunc
    END
!   call writefile(text, 'XheredocFail', 'D')
    call assert_fails('source XheredocFail', 'E1145:')
  
    let text =<< trim CodeEnd
    func MissingEnd()
      let v =<< END
    endfunc
    CodeEnd
!   call writefile(text, 'XheredocWrong', 'D')
    call assert_fails('source XheredocWrong', 'E1145:')
  
    let text =<< trim TEXTend
      let v =<< " comment
    TEXTend
!   call writefile(text, 'XheredocNoMarker', 'D')
    call assert_fails('source XheredocNoMarker', 'E172:')
  
    let text =<< trim TEXTend
      let v =<< text
    TEXTend
!   call writefile(text, 'XheredocBadMarker', 'D')
    call assert_fails('source XheredocBadMarker', 'E221:')
  
!   call writefile(['let v =<< TEXT', 'abc'], 'XheredocMissingMarker', 'D')
    call assert_fails('source XheredocMissingMarker', 'E990:')
  endfunc
  
  func Test_let_heredoc_trim_no_indent_marker()
*** ../vim-9.0.0624/src/testdir/test_listchars.vim	2022-06-07 10:08:26.000000000 +0100
--- src/testdir/test_listchars.vim	2022-09-29 20:53:28.531945412 +0100
***************
*** 664,670 ****
        vsplit
        windo set signcolumn=yes foldcolumn=1 winminwidth=0 nowrap list listchars=extends:>,precedes:<
    END
!   call writefile(lines, 'XTest_listchars')
  
    let buf = RunVimInTerminal('-S XTest_listchars', {'rows': 10, 'cols': 60})
  
--- 664,670 ----
        vsplit
        windo set signcolumn=yes foldcolumn=1 winminwidth=0 nowrap list listchars=extends:>,precedes:<
    END
!   call writefile(lines, 'XTest_listchars', 'D')
  
    let buf = RunVimInTerminal('-S XTest_listchars', {'rows': 10, 'cols': 60})
  
***************
*** 687,693 ****
  
    " clean up
    call StopVimInTerminal(buf)
-   call delete('XTest_listchars')
  endfunc
  
  
--- 687,692 ----
*** ../vim-9.0.0624/src/testdir/test_lua.vim	2022-09-17 21:07:52.107993141 +0100
--- src/testdir/test_lua.vim	2022-09-29 20:54:39.215812276 +0100
***************
*** 817,824 ****
  
  " Test :luafile foo.lua
  func Test_luafile()
!   call delete('Xlua_file')
!   call writefile(["str = 'hello'", "num = 123" ], 'Xlua_file')
    call setfperm('Xlua_file', 'r-xr-xr-x')
  
    luafile Xlua_file
--- 817,823 ----
  
  " Test :luafile foo.lua
  func Test_luafile()
!   call writefile(["str = 'hello'", "num = 123" ], 'Xlua_file', 'D')
    call setfperm('Xlua_file', 'r-xr-xr-x')
  
    luafile Xlua_file
***************
*** 826,832 ****
    call assert_equal(123, luaeval('num'))
  
    lua str, num = nil
-   call delete('Xlua_file')
  endfunc
  
  " Test :luafile %
--- 825,830 ----
***************
*** 849,860 ****
  " Test :luafile with syntax error
  func Test_luafile_error()
    new Xlua_file
!   call writefile(['nil = 0' ], 'Xlua_file')
    call setfperm('Xlua_file', 'r-xr-xr-x')
  
    call assert_fails('luafile Xlua_file', "Xlua_file:1: unexpected symbol near 'nil'")
  
-   call delete('Xlua_file')
    bwipe!
  endfunc
  
--- 847,857 ----
  " Test :luafile with syntax error
  func Test_luafile_error()
    new Xlua_file
!   call writefile(['nil = 0' ], 'Xlua_file', 'D')
    call setfperm('Xlua_file', 'r-xr-xr-x')
  
    call assert_fails('luafile Xlua_file', "Xlua_file:1: unexpected symbol near 'nil'")
  
    bwipe!
  endfunc
  
*** ../vim-9.0.0624/src/version.c	2022-09-29 20:23:32.200338251 +0100
--- src/version.c	2022-09-29 20:56:47.575504308 +0100
***************
*** 701,702 ****
--- 701,704 ----
  {   /* Add new patch number below this line */
+ /**/
+     625,
  /**/

-- 
If evolution theories are correct, humans will soon grow a third
hand for operating the mouse.

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