1
0
forked from aniani/vim

updated for version 7.4.608

Problem:    test_eval fails when the clipboard feature is missing.
Solution:   Skip part of the test. Reduce the text used.
This commit is contained in:
Bram Moolenaar
2015-01-27 22:52:15 +01:00
parent 73a156bf36
commit 4ac163ae5f
3 changed files with 24 additions and 11 deletions

View File

@@ -2,13 +2,19 @@ Test for various eval features. vim: set ft=vim :
Note: system clipboard is saved, changed and restored. Note: system clipboard is saved, changed and restored.
clipboard contents
something else
STARTTEST STARTTEST
:so small.vim :so small.vim
:set encoding=latin1 :set encoding=latin1
:set noswapfile :set noswapfile
:lang C :lang C
:fun AppendRegContents(reg) :fun AppendRegContents(reg)
call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1)))) call AppendRegParts(a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1)))
:endfun
:fun AppendRegParts(reg, type, cont, strcont, cont1, strcont1)
call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, a:type, a:cont, a:strcont, a:cont1, a:strcont1))
endfun endfun
:command -nargs=? AR :call AppendRegContents(<q-args>) :command -nargs=? AR :call AppendRegContents(<q-args>)
:fun SetReg(...) :fun SetReg(...)
@@ -122,18 +128,23 @@ call SetReg('/', ["abc/\n"])
call SetReg('=', ['"abc/"']) call SetReg('=', ['"abc/"'])
call SetReg('=', ["\"abc/\n\""]) call SetReg('=', ["\"abc/\n\""])
$put ='{{{1 System clipboard' $put ='{{{1 System clipboard'
if has('clipboard')
" Save and restore system clipboard. " Save and restore system clipboard.
" If no connection to X-Server is possible, test should succeed. " If no connection to X-Server is possible, test should succeed.
:let _clipreg = ['+', getreg('+'), getregtype('+')] let _clipreg = ['+', getreg('+'), getregtype('+')]
:let _clipopt = &cb let _clipopt = &cb
:let &cb='unnamedplus' let &cb='unnamedplus'
:1y 5y
:AR + AR +
:tabdo :windo :echo "hi" tabdo :windo :echo "hi"
:3y 6y
:AR + AR +
:let &cb=_clipopt let &cb=_clipopt
:call call('setreg', _clipreg) call call('setreg', _clipreg)
else
call AppendRegParts('+', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']")
call AppendRegParts('+', 'V', "something else\n", "['something else']", "something else\n", "['something else']")
endif
$put ='{{{1 Errors' $put ='{{{1 Errors'
call ErrExe('call setreg()') call ErrExe('call setreg()')
call ErrExe('call setreg(1)') call ErrExe('call setreg(1)')

Binary file not shown.

View File

@@ -741,6 +741,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 */
/**/
608,
/**/ /**/
607, 607,
/**/ /**/