To: vim_dev@googlegroups.com Subject: Patch 8.0.1594 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1594 Problem: :conform qall not tested with active terminal window. Solution: Add a test. Files: src/testdir/test_terminal.vim *** ../vim-8.0.1593/src/testdir/test_terminal.vim 2018-03-10 20:27:32.075757637 +0100 --- src/testdir/test_terminal.vim 2018-03-10 20:49:19.927571572 +0100 *************** *** 885,887 **** --- 885,910 ---- " close the terminal window where Vim was running quit endfunc + + " Run Vim in a terminal, then start a terminal in that Vim without a kill + " argument, check that :confirm qall works. + func Test_terminal_qall_prompt() + if !CanRunVimInTerminal() + return + endif + let buf = RunVimInTerminal('', {}) + + " Open a terminal window and wait for the prompt to appear + call term_sendkeys(buf, ":term\") + call WaitFor({-> term_getline(buf, 10) =~ '\[running]'}) + call WaitFor({-> term_getline(buf, 1) !~ '^\s*$'}) + + " make Vim exit, it will prompt to kill the shell + call term_sendkeys(buf, "\:confirm qall\") + call WaitFor({-> term_getline(buf, 20) =~ 'ancel:'}) + call term_sendkeys(buf, "y") + call WaitFor({-> term_getstatus(buf) == "finished"}) + + " close the terminal window where Vim was running + quit + endfunc *** ../vim-8.0.1593/src/version.c 2018-03-10 20:27:32.079757611 +0100 --- src/version.c 2018-03-10 20:50:30.211129448 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1594, /**/ -- Engineers are widely recognized as superior marriage material: intelligent, dependable, employed, honest, and handy around the house. (Scott Adams - The Dilbert principle) /// 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 ///