thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.5095: terminal test still fails with some shell commands

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2022-06-14 19:52:16 +01:00
parent 8c1b8cb2e0
commit 99f4b6e082
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_terminal.vim
View File

@@ -1219,10 +1219,11 @@ endfunc
func Test_terminal_qall_prompt() func Test_terminal_qall_prompt()
CheckRunVimInTerminal CheckRunVimInTerminal
" the shell may set the window title, we don't want that here
call test_override('vterm_title', 1)
let buf = RunVimInTerminal('', {}) 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 " Open a terminal window and wait for the prompt to appear
call term_sendkeys(buf, ":term\<CR>") call term_sendkeys(buf, ":term\<CR>")
call WaitForAssert({-> assert_match('\[running]', term_getline(buf, 10))}) 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 " close the terminal window where Vim was running
quit quit
call test_override('ALL', 0)
endfunc endfunc
" Run Vim in a terminal, then start a terminal window with a shell and check " Run Vim in a terminal, then start a terminal window with a shell and check

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5095,
/**/ /**/
5094, 5094,
/**/ /**/