Skip to content

Commit e738b25

Browse files
committed
updated for version 7.4.612
Problem: test_eval fails on Mac. Solution: Use the * register instead of the + register. (Jun Takimoto)
1 parent 5cb1aed commit e738b25

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/testdir/test_eval.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,19 @@ $put ='{{{1 System clipboard'
131131
if has('clipboard')
132132
" Save and restore system clipboard.
133133
" If no connection to X-Server is possible, test should succeed.
134-
let _clipreg = ['+', getreg('+'), getregtype('+')]
134+
let _clipreg = ['*', getreg('*'), getregtype('*')]
135135
let _clipopt = &cb
136-
let &cb='unnamedplus'
136+
let &cb='unnamed'
137137
5y
138-
AR +
138+
AR *
139139
tabdo :windo :echo "hi"
140140
6y
141-
AR +
141+
AR *
142142
let &cb=_clipopt
143143
call call('setreg', _clipreg)
144144
else
145-
call AppendRegParts('+', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']")
146-
call AppendRegParts('+', 'V', "something else\n", "['something else']", "something else\n", "['something else']")
145+
call AppendRegParts('*', 'V', "clipboard contents\n", "['clipboard contents']", "clipboard contents\n", "['clipboard contents']")
146+
call AppendRegParts('*', 'V', "something else\n", "['something else']", "something else\n", "['something else']")
147147
endif
148148
$put ='{{{1 Errors'
149149
call ErrExe('call setreg()')

src/testdir/test_eval.ok

0 Bytes
Binary file not shown.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
612,
744746
/**/
745747
611,
746748
/**/

0 commit comments

Comments
 (0)