# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1422976067 -3600
# Node ID 75238dbe85432f4980aee44b25921880b3122f64
# Parent  ec27922631d8aaa0aebb2442d38ee95e78346bc3
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
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -131,19 +131,19 @@ call SetReg('=', ["\"abc/\n\""])
 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 c4fc9ac0b2a25bbc32abf447331a2ebbc6b14755..cda425c92e30762a9c5949964be411a517884f0d
GIT binary patch
literal 11246
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
O`(4pvZ<<}aciumC)Ft=;

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    612,
+/**/
     611,
 /**/
     610,