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)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index e2eac5394f6ced7aa0e35017d7181c736728fbbb..b64d5cf414f646916cb7dcdb944b624b44bd3ab4 100644 (file)
--- 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)\<CR>")
+
   " Open a terminal window and wait for the prompt to appear
   call term_sendkeys(buf, ":term\<CR>")
   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 fb9f794f1e464798f414a4c95506e3d69077db37..e4d5553404c1bbef3162999ae8c142584bf86ec8 100644 (file)
--- 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,
 /**/