updated for version 7.4.612
Problem: test_eval fails on Mac.
Solution: Use the * register instead of the + register. (Jun Takimoto)
diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in
index b0ac3a0..087e609 100644
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -131,19 +131,19 @@
if has('clipboard')
" Save and restore system clipboard.
" If no connection to X-Server is possible, test should succeed.
-let _clipreg = ['+', getreg('+'), getregtype('+')]
+let _clipreg = ['*', getreg('*'), getregtype('*')]
let _clipopt = &cb
-let &cb='unnamedplus'
+let &cb='unnamed'
5y
-AR +
+AR *
tabdo :windo :echo "hi"
6y
-AR +
+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']")
+ 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()')
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index c4fc9ac..cda425c 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 a35367f..b1514b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 612,
+/**/
611,
/**/
610,
