diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-10 20:51:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-10 20:51:25 +0100 |
| commit | 435acdb88c849c6bac44ef30f24f29618b36af50 (patch) | |
| tree | cc6c92323873267160b2ecaa8c4d0972d2738f4f | |
| parent | 25cdd9c33b21ddbd31321c075873bb225450d2d2 (diff) | |
patch 8.0.1594: :conform qall not tested with active terminal windowv8.0.1594
Problem: :conform qall not tested with active terminal window.
Solution: Add a test.
| -rw-r--r-- | src/testdir/test_terminal.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index ef6b176eec..0178e3b888 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -885,3 +885,26 @@ func Test_terminal_qall_kill_func() " 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\<CR>") + 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, "\<C-W>:confirm qall\<CR>") + 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 diff --git a/src/version.c b/src/version.c index 727c21fe1c..a6c7279c03 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1594, +/**/ 1593, /**/ 1592, |