1
0
forked from aniani/vim

updated for version 7.4.612

Problem:    test_eval fails on Mac.
Solution:   Use the * register instead of the + register. (Jun Takimoto)
This commit is contained in:
Bram Moolenaar
2015-02-03 16:07:47 +01:00
parent b641df4965
commit e08dd4e49e
3 changed files with 8 additions and 6 deletions

View File

@@ -131,19 +131,19 @@ $put ='{{{1 System clipboard'
if has('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='unnamed'
5y 5y
AR + AR *
tabdo :windo :echo "hi" tabdo :windo :echo "hi"
6y 6y
AR + AR *
let &cb=_clipopt let &cb=_clipopt
call call('setreg', _clipreg) call call('setreg', _clipreg)
else else
call AppendRegParts('+', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']") 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']") call AppendRegParts('*', 'V', "something else\n", "['something else']", "something else\n", "['something else']")
endif endif
$put ='{{{1 Errors' $put ='{{{1 Errors'
call ErrExe('call setreg()') call ErrExe('call setreg()')

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 */
/**/
612,
/**/ /**/
611, 611,
/**/ /**/