From 99f4b6e0824b339510aaaa0bb81c50f5866f6be1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 14 Jun 2022 19:52:16 +0100 Subject: patch 8.2.5095: terminal test still fails with some shell commands Problem: Terminal test still fails with some shell commands. Solution: Disable setting the window title in the Vim instance running in a terminal window. (closes #10530) --- src/testdir/test_terminal.vim | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index e2eac5394..b64d5cf41 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1219,10 +1219,11 @@ endfunc 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('', {}) + " the shell may set the window title, we don't want that here + call term_sendkeys(buf, ":test_override('vterm_title', 1)\") + " Open a terminal window and wait for the prompt to appear call term_sendkeys(buf, ":term\") call WaitForAssert({-> assert_match('\[running]', term_getline(buf, 10))}) @@ -1236,7 +1237,6 @@ 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 fb9f794f1..e4d555340 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5095, /**/ 5094, /**/ -- cgit v1.2.1