diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-02-03 16:07:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-02-03 16:07:47 +0100 |
| commit | 5235633748b36b740f532ac414e7e5d9b8c50d77 (patch) | |
| tree | ff0f94f9fcce749a02e0f10ce2cd1e8a09ec6cf3 | |
| parent | 335d18e2aa023883beab20f5a772e8d3755356bd (diff) | |
| download | vim-5235633748b36b740f532ac414e7e5d9b8c50d77.tar.gz | |
Problem: test_eval fails on Mac.
Solution: Use the * register instead of the + register. (Jun Takimoto)
| -rw-r--r-- | src/testdir/test_eval.in | 12 | ||||
| -rw-r--r-- | src/testdir/test_eval.ok | bin | 11246 -> 11246 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in index b0ac3a02..087e6099 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 Binary files differindex c4fc9ac0..cda425c9 100644 --- a/src/testdir/test_eval.ok +++ b/src/testdir/test_eval.ok diff --git a/src/version.c b/src/version.c index a35367fe..b1514b1b 100644 --- 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, |