To: vim_dev@googlegroups.com
Subject: Patch 8.1.2093
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.1.2093
Problem:    MS-Windows: system() test fails.
Solution:   Expect CR when using systemlist().
Files:	    src/testdir/test_system.vim


*** ../vim-8.1.2092/src/testdir/test_system.vim	2019-09-28 15:51:33.818357228 +0200
--- src/testdir/test_system.vim	2019-09-28 16:22:29.394074609 +0200
***************
*** 12,20 ****
    else
      call assert_equal("123\n", system('echo 123'))
      call assert_equal(["123\r"], systemlist('echo 123'))
!     call assert_equal("123",   system('more', '123'))
!     call assert_equal(["123"], systemlist('more', '123'))
!     call assert_equal(["as\<NL>df"], systemlist('more', ["as\<NL>df"]))
    endif
  
    if !executable('cat') || !executable('wc')
--- 12,20 ----
    else
      call assert_equal("123\n", system('echo 123'))
      call assert_equal(["123\r"], systemlist('echo 123'))
!     call assert_equal("123\n",   system('more', '123'))
!     call assert_equal(["123\r"], systemlist('more', '123'))
!     call assert_equal(["as\r", "df\r"], systemlist('more', ["as\<NL>df"]))
    endif
  
    if !executable('cat') || !executable('wc')
***************
*** 62,68 ****
      call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
    else
      let out = systemlist('more', bufnr('%'))
!     call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
    endif
    bwipe!
  
--- 62,68 ----
      call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
    else
      let out = systemlist('more', bufnr('%'))
!     call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"],  out)
    endif
    bwipe!
  
*** ../vim-8.1.2092/src/version.c	2019-09-28 15:51:33.818357228 +0200
--- src/version.c	2019-09-28 15:56:50.417280931 +0200
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     2093,
  /**/

-- 
Witches prefer brooms: vacuum-cleaners need extension cords!

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