From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 3 Feb 2015 15:07:47 +0000 (+0100)
Subject: updated for version 7.4.612
X-Git-Tag: v7.4.612
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e08dd4e49e6d67686e3ba1322a641488ad67c711;p=thirdparty%2Fvim.git

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 b0ac3a0290..087e6099ac 100644
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -131,19 +131,19 @@ $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 _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 c4fc9ac0b2..cda425c92e 100644
Binary files a/src/testdir/test_eval.ok and b/src/testdir/test_eval.ok differ
diff --git a/src/version.c b/src/version.c
index a35367fec9..b1514b1b58 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    612,
 /**/
     611,
 /**/