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.
diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in
index b9f68f7..b0ac3a0 100644
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -2,13 +2,19 @@
Note: system clipboard is saved, changed and restored.
+clipboard contents
+something else
+
STARTTEST
:so small.vim
:set encoding=latin1
:set noswapfile
:lang C
: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
:command -nargs=? AR :call AppendRegContents(<q-args>)
:fun SetReg(...)
@@ -122,18 +128,23 @@
call SetReg('=', ['"abc/"'])
call SetReg('=', ["\"abc/\n\""])
$put ='{{{1 System clipboard'
+if has('clipboard')
" Save and restore system clipboard.
" If no connection to X-Server is possible, test should succeed.
-:let _clipreg = ['+', getreg('+'), getregtype('+')]
-:let _clipopt = &cb
-:let &cb='unnamedplus'
-:1y
-:AR +
-:tabdo :windo :echo "hi"
-:3y
-:AR +
-:let &cb=_clipopt
-:call call('setreg', _clipreg)
+let _clipreg = ['+', getreg('+'), getregtype('+')]
+let _clipopt = &cb
+let &cb='unnamedplus'
+5y
+AR +
+tabdo :windo :echo "hi"
+6y
+AR +
+let &cb=_clipopt
+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'
call ErrExe('call setreg()')
call ErrExe('call setreg(1)')
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index 5e8d2cc..c4fc9ac 100644
--- a/src/testdir/test_eval.ok
+++ b/src/testdir/test_eval.ok
Binary files differ
diff --git a/src/version.c b/src/version.c
index 1c4693f..8e26439 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 608,
+/**/
607,
/**/
606,