IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12883 from janlazo/vim-8.2.1640

Browse Source 
vim-patch:8.1.{1296,1297,1298},8.2.{1640,1645,1646,1648,1649,1654,1655,1661}
This commit is contained in:
Jan Edmund Lazo 2020-09-12 15:04:56 -04:00 committed by GitHub
commit 4d3ef578e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/testdir/test_startup.vim
View File

@ -369,12 +369,11 @@ func Test_invalid_args()
endfor
if has('clientserver')
" FIXME: need to add --servername to this list
" but it causes vim-8.1.1282 to crash!
for opt in ['--remote', '--remote-send', '--remote-silent', '--remote-expr',
\ '--remote-tab', '--remote-tab-wait',
\ '--remote-tab-wait-silent', '--remote-tab-silent',
\ '--remote-wait', '--remote-wait-silent',
\ '--servername',
\ ]
let out = split(system(GetVimCommand() .. ' ' .. opt), "\n")
call assert_equal(1, v:shell_error)
@ -384,14 +383,21 @@ func Test_invalid_args()
endfor
endif
" FIXME: commented out as this causes vim-8.1.1282 to crash!
"if has('clipboard')
" let out = split(system(GetVimCommand() .. ' --display'), "\n")
" call assert_equal(1, v:shell_error)
" call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
" call assert_equal('Argument missing after: "--display"', out[1])
" call assert_equal('More info with: "vim -h"', out[2])
"endif
if has('gui_gtk')
let out = split(system(GetVimCommand() .. ' --display'), "\n")
call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
call assert_equal('Argument missing after: "--display"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endif
if has('xterm_clipboard')
let out = split(system(GetVimCommand() .. ' -display'), "\n")
call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
call assert_equal('Argument missing after: "-display"', out[1])
call assert_equal('More info with: "vim -h"', out[2])
endif
let out = split(system(GetVimCommand() .. ' -ix'), "\n")
call assert_equal(1, v:shell_error)