mirror of
				https://github.com/neovim/neovim.git
				synced 2025-10-26 12:27:24 +00:00 
			
		
		
		
	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:
		| @@ -2548,7 +2548,13 @@ func Test_Changed_FirstTime() | |||||||
|   let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3}) |   let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3}) | ||||||
|   call assert_equal('running', term_getstatus(buf)) |   call assert_equal('running', term_getstatus(buf)) | ||||||
|   " Wait for the ruler (in the status line) to be shown. |   " Wait for the ruler (in the status line) to be shown. | ||||||
|  |   " 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))}) |     call WaitForAssert({-> assert_match('\<All$', term_getline(buf, 3))}) | ||||||
|  |   endif | ||||||
|   " It's only adding autocmd, so that no event occurs. |   " 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, ":au! TextChanged <buffer> call writefile(['No'], 'Xchanged.txt')\<cr>") | ||||||
|   call term_sendkeys(buf, "\<C-\\>\<C-N>:qa!\<cr>") |   call term_sendkeys(buf, "\<C-\\>\<C-N>:qa!\<cr>") | ||||||
|   | |||||||
| @@ -367,7 +367,7 @@ func Test_mksession_terminal_shell() | |||||||
|       call assert_report('unexpected shell line: ' . line) |       call assert_report('unexpected shell line: ' . line) | ||||||
|     endif |     endif | ||||||
|   endfor |   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 Stop_shell_in_terminal(bufnr('%')) | ||||||
|   call delete('Xtest_mks.out') |   call delete('Xtest_mks.out') | ||||||
| @@ -447,7 +447,7 @@ func Test_mksession_terminal_restore_other() | |||||||
|       let term_cmd = line |       let term_cmd = line | ||||||
|     endif |     endif | ||||||
|   endfor |   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 Stop_shell_in_terminal(bufnr('%')) | ||||||
|   call delete('Xtest_mks.out') |   call delete('Xtest_mks.out') | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 zeertzjq
					zeertzjq