To: vim_dev@googlegroups.com Subject: Patch 8.2.1400 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1400 Problem: Vim9: test does not delete written files. Solution: Correct file names. Files: src/testdir/test_vim9_script.vim *** ../vim-8.2.1399/src/testdir/test_vim9_script.vim 2020-08-08 22:15:56.712722262 +0200 --- src/testdir/test_vim9_script.vim 2020-08-09 12:58:57.742997413 +0200 *************** *** 1395,1401 **** nnoremap trigger g:Trigger() feedkeys('trigger', "xt") ! delete('Xexport.vim') delete('Ximport.vim') nunmap trigger enddef --- 1395,1401 ---- nnoremap trigger g:Trigger() feedkeys('trigger', "xt") ! delete('Xexport_that.vim') delete('Ximport.vim') nunmap trigger enddef *************** *** 1407,1417 **** vim9script export let That = 'yes' END ! writefile(export_lines, 'ftplugin/Xexport_that.vim') let import_lines =<< trim END vim9script ! import That from './Xexport_that.vim' assert_equal('yes', That) g:did_load_mytpe = 1 END --- 1407,1417 ---- vim9script export let That = 'yes' END ! writefile(export_lines, 'ftplugin/Xexport_ft.vim') let import_lines =<< trim END vim9script ! import That from './Xexport_ft.vim' assert_equal('yes', That) g:did_load_mytpe = 1 END *************** *** 1425,1431 **** assert_equal(1, g:did_load_mytpe) quit! ! delete('Xexport.vim') delete('ftplugin', 'rf') &rtp = save_rtp enddef --- 1425,1431 ---- assert_equal(1, g:did_load_mytpe) quit! ! delete('Xexport_ft.vim') delete('ftplugin', 'rf') &rtp = save_rtp enddef *************** *** 1484,1496 **** return 0 enddef END ! writefile(export, 'Xexport.vim') ! let buf = RunVimInTerminal('-c "import Foo from ''./Xexport.vim''"', #{ rows: 6, wait_for_ruler: 0}) WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) ! delete('Xexport.vim') StopVimInTerminal(buf) enddef --- 1484,1496 ---- return 0 enddef END ! writefile(export, 'XexportCmd.vim') ! let buf = RunVimInTerminal('-c "import Foo from ''./XexportCmd.vim''"', #{ rows: 6, wait_for_ruler: 0}) WaitForAssert({-> assert_match('^E1094:', term_getline(buf, 5))}) ! delete('XexportCmd.vim') StopVimInTerminal(buf) enddef *** ../vim-8.2.1399/src/version.c 2020-08-08 22:15:56.712722262 +0200 --- src/version.c 2020-08-09 13:01:52.270650095 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1400, /**/ -- hundred-and-one symptoms of being an internet addict: 160. You get in the elevator and double-click the button for the floor you want. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///