To: vim_dev@googlegroups.com
Subject: Patch 7.4.612
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.612
Problem:    test_eval fails on Mac.
Solution:   Use the * register instead of the + register. (Jun Takimoto)
Files:	    src/testdir/test_eval.in, src/testdir/test_eval.ok


*** ../vim-7.4.611/src/testdir/test_eval.in	2015-01-27 22:52:10.709525010 +0100
--- src/testdir/test_eval.in	2015-02-03 16:05:10.127261649 +0100
***************
*** 131,149 ****
  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'
  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()')
--- 131,149 ----
  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='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()')
*** ../vim-7.4.611/src/testdir/test_eval.ok	2015-01-27 22:52:10.709525010 +0100
--- src/testdir/test_eval.ok	2015-02-03 16:05:44.850883668 +0100
***************
*** 317,324 ****
  {{{2 setreg('=', ['"abc/ "'])
  =: type v; value: abc/  (['abc/ ']), expr: "abc/ " (['"abc/ "'])
  {{{1 System clipboard
! +: type V; value: clipboard contents  (['clipboard contents']), expr: clipboard contents  (['clipboard contents'])
! +: type V; value: something else  (['something else']), expr: something else  (['something else'])
  {{{1 Errors
  Executing call setreg()
  Vim(call):E119: Not enough arguments for function: setreg
--- 317,324 ----
  {{{2 setreg('=', ['"abc/ "'])
  =: type v; value: abc/  (['abc/ ']), expr: "abc/ " (['"abc/ "'])
  {{{1 System clipboard
! *: type V; value: clipboard contents  (['clipboard contents']), expr: clipboard contents  (['clipboard contents'])
! *: type V; value: something else  (['something else']), expr: something else  (['something else'])
  {{{1 Errors
  Executing call setreg()
  Vim(call):E119: Not enough arguments for function: setreg
*** ../vim-7.4.611/src/version.c	2015-02-03 13:15:59.614101028 +0100
--- src/version.c	2015-02-03 16:04:38.347607563 +0100
***************
*** 743,744 ****
--- 743,746 ----
  {   /* Add new patch number below this line */
+ /**/
+     612,
  /**/

-- 
Did you ever see a "Hit any key to continue" message in a music piece?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///