vim-patch:8.1.0870: Vim doesn't use the new ConPTY support in Windows 10

Problem:    Vim doesn't use the new ConPTY support in Windows 10.
Solution:   Use ConPTY support, if available. (Nobuhiro Takasaki, closes vim/vim#3794)

aa5df7e312

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-11-13 13:24:10 +08:00
parent 4872e2da3c
commit 36ce30be20
2 changed files with 9 additions and 3 deletions

View File

@ -2548,7 +2548,13 @@ func Test_Changed_FirstTime()
let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
call assert_equal('running', term_getstatus(buf))
" Wait for the ruler (in the status line) to be shown.
call WaitForAssert({-> assert_match('\<All$', term_getline(buf, 3))})
" In ConPTY, there is additional character which is drawn up to the width of
" the screen.
if has('conpty')
call WaitForAssert({-> assert_match('\<All.*$', term_getline(buf, 3))})
else
call WaitForAssert({-> assert_match('\<All$', term_getline(buf, 3))})
endif
" It's only adding autocmd, so that no event occurs.
call term_sendkeys(buf, ":au! TextChanged <buffer> call writefile(['No'], 'Xchanged.txt')\<cr>")
call term_sendkeys(buf, "\<C-\\>\<C-N>:qa!\<cr>")

View File

@ -367,7 +367,7 @@ func Test_mksession_terminal_shell()
call assert_report('unexpected shell line: ' . line)
endif
endfor
call assert_match('terminal ++curwin ++cols=\d\+ ++rows=\d\+\s*$', term_cmd)
call assert_match('terminal ++curwin ++cols=\d\+ ++rows=\d\+\s*.*$', term_cmd)
call Stop_shell_in_terminal(bufnr('%'))
call delete('Xtest_mks.out')
@ -447,7 +447,7 @@ func Test_mksession_terminal_restore_other()
let term_cmd = line
endif
endfor
call assert_match('terminal ++curwin ++cols=\d\+ ++rows=\d\+ other', term_cmd)
call assert_match('terminal ++curwin ++cols=\d\+ ++rows=\d\+.*other', term_cmd)
call Stop_shell_in_terminal(bufnr('%'))
call delete('Xtest_mks.out')