Merge pull request #3868 from Shougo/vim-7.4.608

vim-patch:7.4.608, 7.4.612

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)')

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,