0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.2.0666: Ruby test fails on MS-Windows

Problem:    Ruby test fails on MS-Windows.
Solution:   Remove the "maintainer" line. (Ken Takata, closes #6015)
This commit is contained in:
Bram Moolenaar
2020-04-30 19:19:29 +02:00
parent a161cb5ddd
commit 88e6cc2539
4 changed files with 16 additions and 14 deletions

View File

@@ -338,4 +338,16 @@ func IsRoot()
return v:false return v:false
endfunc endfunc
" Get all messages but drop the maintainer entry.
func GetMessages()
redir => result
redraw | messages
redir END
let msg_list = split(result, "\n")
if msg_list->len() > 0 && msg_list[0] =~ 'Messages maintainer:'
return msg_list[1:]
endif
return msg_list
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -3,18 +3,6 @@
source shared.vim source shared.vim
source term_util.vim source term_util.vim
" Get all messages but drop the maintainer entry.
func GetMessages()
redir => result
redraw | messages
redir END
let msg_list = split(result, "\n")
if msg_list->len() > 0 && msg_list[0] =~ 'Messages maintainer:'
return msg_list[1:]
endif
return msg_list
endfunc
func Test_messages() func Test_messages()
let oldmore = &more let oldmore = &more
try try

View File

@@ -378,7 +378,7 @@ endfunc
func Test_ruby_p() func Test_ruby_p()
ruby p 'Just a test' ruby p 'Just a test'
let messages = split(execute('message'), "\n") let messages = GetMessages()
call assert_equal('"Just a test"', messages[-1]) call assert_equal('"Just a test"', messages[-1])
" Check return values of p method " Check return values of p method
@@ -391,7 +391,7 @@ func Test_ruby_p()
messages clear messages clear
call assert_equal(v:true, rubyeval('p() == nil')) call assert_equal(v:true, rubyeval('p() == nil'))
let messages = split(execute('message'), "\n") let messages = GetMessages()
call assert_equal(0, len(messages)) call assert_equal(0, len(messages))
endfunc endfunc

View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
666,
/**/ /**/
665, 665,
/**/ /**/