To: vim_dev@googlegroups.com Subject: Patch 8.2.1404 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1404 Problem: Vim9: script test fails in the GUI. Solution: Use another key to map. Improve cleanup. Files: src/testdir/test_vim9_script.vim *** ../vim-8.2.1403/src/testdir/test_vim9_script.vim 2020-08-09 14:33:51.912756045 +0200 --- src/testdir/test_vim9_script.vim 2020-08-09 14:42:11.727681083 +0200 *************** *** 1117,1122 **** --- 1117,1127 ---- enddef END + def Undo_export_script_lines() + unlet g:result + unlet g:localname + enddef + def Test_vim9_import_export() let import_script_lines =<< trim END vim9script *************** *** 1155,1162 **** assert_equal('John Doe', g:imported_name_appended) assert_false(exists('g:name')) ! unlet g:result ! unlet g:localname unlet g:imported unlet g:imported_added unlet g:imported_later --- 1160,1166 ---- assert_equal('John Doe', g:imported_name_appended) assert_false(exists('g:name')) ! Undo_export_script_lines() unlet g:imported unlet g:imported_added unlet g:imported_later *************** *** 1441,1458 **** lines =<< trim END vim9script import Funcx from './XsomeExport.vim' ! nnoremap :call Funcx() END writefile(lines, 'Xmapscript.vim') source Xmapscript.vim ! feedkeys("\", "xt") assert_equal(42, g:result) unlet g:result delete('XsomeExport.vim') delete('Xmapscript.vim') ! nunmap enddef def Test_vim9script_fails() --- 1445,1462 ---- lines =<< trim END vim9script import Funcx from './XsomeExport.vim' ! nnoremap :call Funcx() END writefile(lines, 'Xmapscript.vim') source Xmapscript.vim ! feedkeys("\", "xt") assert_equal(42, g:result) unlet g:result delete('XsomeExport.vim') delete('Xmapscript.vim') ! nunmap enddef def Test_vim9script_fails() *************** *** 1697,1702 **** --- 1701,1708 ---- '4 LOADSCRIPT exported from .*Xexport_abs.vim.*' .. '5 STOREG g:imported_after.*', g:import_disassembled) + + Undo_export_script_lines() unlet g:imported_abs unlet g:import_disassembled *************** *** 1720,1727 **** &rtp = save_rtp assert_equal(9876, g:imported_rtp) - unlet g:imported_rtp delete('Ximport_rtp.vim') delete('import', 'rf') enddef --- 1726,1734 ---- &rtp = save_rtp assert_equal(9876, g:imported_rtp) + Undo_export_script_lines() + unlet g:imported_rtp delete('Ximport_rtp.vim') delete('import', 'rf') enddef *** ../vim-8.2.1403/src/version.c 2020-08-09 14:33:51.912756045 +0200 --- src/version.c 2020-08-09 14:39:56.667821724 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1404, /**/ -- hundred-and-one symptoms of being an internet addict: 163. You go outside for the fresh air (at -30 degrees) but open the window first to hear new mail arrive. /// 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 ///