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

Patch 8.2.0666
Problem:    Ruby test fails on MS-Windows.
Solution:   Remove the "maintainer" line. (Ken Takata, closes #6015)
Files:      src/testdir/shared.vim, src/testdir/test_messages.vim,
            src/testdir/test_ruby.vim


*** ../vim-8.2.0665/src/testdir/shared.vim	2020-04-04 14:00:34.193098268 +0200
--- src/testdir/shared.vim	2020-04-30 19:15:28.721517171 +0200
***************
*** 338,341 ****
--- 338,353 ----
    return v:false
  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-8.2.0665/src/testdir/test_messages.vim	2020-04-25 17:13:53.248729906 +0200
--- src/testdir/test_messages.vim	2020-04-30 19:15:28.721517171 +0200
***************
*** 3,20 ****
  source shared.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()
    let oldmore = &more
    try
--- 3,8 ----
*** ../vim-8.2.0665/src/testdir/test_ruby.vim	2020-04-14 20:15:45.288566185 +0200
--- src/testdir/test_ruby.vim	2020-04-30 19:15:28.721517171 +0200
***************
*** 378,384 ****
  
  func Test_ruby_p()
    ruby p 'Just a test'
!   let messages = split(execute('message'), "\n")
    call assert_equal('"Just a test"', messages[-1])
  
    " Check return values of p method
--- 378,384 ----
  
  func Test_ruby_p()
    ruby p 'Just a test'
!   let messages = GetMessages()
    call assert_equal('"Just a test"', messages[-1])
  
    " Check return values of p method
***************
*** 391,397 ****
    messages clear
    call assert_equal(v:true, rubyeval('p() == nil'))
  
!   let messages = split(execute('message'), "\n")
    call assert_equal(0, len(messages))
  endfunc
  
--- 391,397 ----
    messages clear
    call assert_equal(v:true, rubyeval('p() == nil'))
  
!   let messages = GetMessages()
    call assert_equal(0, len(messages))
  endfunc
  
*** ../vim-8.2.0665/src/version.c	2020-04-30 19:09:31.750196251 +0200
--- src/version.c	2020-04-30 19:17:03.517284982 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     666,
  /**/

-- 
What a wonderfully exciting cough!  Do you mind if I join you?
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///