diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-11-13 13:24:10 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2023-11-13 13:24:51 +0800 |
| commit | 36ce30be206a57b6533c1740a26007c8b864b477 (patch) | |
| tree | 8869c1e62fa74fcd704936dcd8436e04cfad63fc | |
| parent | 4872e2da3cad407f0f45dbb5cc75d0c67743ad22 (diff) | |
| download | rneovim-36ce30be206a57b6533c1740a26007c8b864b477.tar.gz rneovim-36ce30be206a57b6533c1740a26007c8b864b477.tar.bz2 rneovim-36ce30be206a57b6533c1740a26007c8b864b477.zip | |
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)
https://github.com/vim/vim/commit/aa5df7e3127dff6b7336df0903f5c569a40eb174
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | test/old/testdir/test_autocmd.vim | 8 | ||||
| -rw-r--r-- | test/old/testdir/test_mksession.vim | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim index cce60e9923..632173e870 100644 --- a/test/old/testdir/test_autocmd.vim +++ b/test/old/testdir/test_autocmd.vim @@ -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>") diff --git a/test/old/testdir/test_mksession.vim b/test/old/testdir/test_mksession.vim index 802211b2c2..efd5beec3a 100644 --- a/test/old/testdir/test_mksession.vim +++ b/test/old/testdir/test_mksession.vim @@ -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') |