diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-26 17:27:40 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-26 17:27:40 +0100 |
| commit | f4e3c13bcc30a0254b01ec3fcfb5a683e961c040 (patch) | |
| tree | 3ff88a3b7d638857cbf0ff799adfec1323dea10a | |
| parent | f0538639c0a58b3ae3a0cd5db49ba24ba8b1a4a3 (diff) | |
| parent | 884c1241306d614679910c6eaa74c8f872f9b1dd (diff) | |
| download | rneovim-f4e3c13bcc30a0254b01ec3fcfb5a683e961c040.tar.gz rneovim-f4e3c13bcc30a0254b01ec3fcfb5a683e961c040.tar.bz2 rneovim-f4e3c13bcc30a0254b01ec3fcfb5a683e961c040.zip | |
Merge pull request #3868 from Shougo/vim-7.4.608
vim-patch:7.4.608, 7.4.612
| -rw-r--r-- | src/nvim/testdir/test_eval.in | 33 | ||||
| -rw-r--r-- | src/nvim/testdir/test_eval.ok | bin | 11106 -> 10814 bytes | |||
| -rw-r--r-- | src/nvim/version.c | 4 |
3 files changed, 24 insertions, 13 deletions
diff --git a/src/nvim/testdir/test_eval.in b/src/nvim/testdir/test_eval.in index b2b982a434..54cdb03ba2 100644 --- a/src/nvim/testdir/test_eval.in +++ b/src/nvim/testdir/test_eval.in @@ -2,12 +2,18 @@ Test for various eval features. vim: set ft=vim : Note: system clipboard is saved, changed and restored. +clipboard contents +something else + STARTTEST :so small.vim :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(...) @@ -121,18 +127,23 @@ call SetReg('/', ["abc/\n"]) 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='unnamed' +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/nvim/testdir/test_eval.ok b/src/nvim/testdir/test_eval.ok Binary files differindex 2cdb8f5da8..cf7a5cd418 100644 --- a/src/nvim/testdir/test_eval.ok +++ b/src/nvim/testdir/test_eval.ok diff --git a/src/nvim/version.c b/src/nvim/version.c index 018bfef9d8..6f267d1582 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -381,11 +381,11 @@ static int included_patches[] = { 615, // 614, // 613, - // 612, + 612, // 611 NA // 610 NA 609, - // 608, + 608, // 607, 606, // 605, |