diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-14 15:00:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-14 15:00:28 +0100 |
| commit | e564c7009dfb065fb5261e548b15f83d32f735c9 (patch) | |
| tree | 55f78f8e664792058f7a8abd8cc11110bc51b54c | |
| parent | 831d6d4c02ca629e7e7a28537fd9048351e5db5c (diff) | |
| download | vim-git-8.2.5091.tar.gz | |
patch 8.2.5091: terminal test fails with some shell commandsv8.2.5091
Problem: Terminal test fails with some shell commands.
Solution: Disable setting the window title. (closes #10530)
| -rw-r--r-- | src/testdir/test_terminal.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 2700b7a91..e2eac5394 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1218,6 +1218,9 @@ endfunc " argument, check that :confirm qall works. func Test_terminal_qall_prompt() CheckRunVimInTerminal + + " the shell may set the window title, we don't want that here + call test_override('vterm_title', 1) let buf = RunVimInTerminal('', {}) " Open a terminal window and wait for the prompt to appear @@ -1233,6 +1236,7 @@ func Test_terminal_qall_prompt() " close the terminal window where Vim was running quit + call test_override('ALL', 0) endfunc " Run Vim in a terminal, then start a terminal window with a shell and check diff --git a/src/version.c b/src/version.c index 9373f605b..f00f8057a 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5091, +/**/ 5090, /**/ 5089, |