changeset 21451:756562af426e v8.2.1276

patch 8.2.1276: MS-Windows: system test may fail if more.exe is installed Commit: https://github.com/vim/vim/commit/4cc45a367363f7754dedd280cd7a065b7a220394 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 23 14:51:02 2020 +0200 patch 8.2.1276: MS-Windows: system test may fail if more.exe is installed Problem: MS-Windows: system test may fail if more.exe is installed. Solution: Explicitly use more.com. (Taro Muraoka, Ken Takata, closes https://github.com/vim/vim/issues/6517)
author Bram Moolenaar <Bram@vim.org>
date Thu, 23 Jul 2020 15:00:04 +0200
parents d6c578125b04
children 22fa8f778a02
files src/testdir/test_system.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -13,9 +13,9 @@ func Test_System()
   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"]))
+    call assert_equal("123\n",   system('more.com', '123'))
+    call assert_equal(["123\r"], systemlist('more.com', '123'))
+    call assert_equal(["as\r", "df\r"], systemlist('more.com', ["as\<NL>df"]))
   endif
 
   new Xdummy
@@ -42,7 +42,7 @@ func Test_System()
     let out = systemlist('cat', bufnr('%'))
     call assert_equal(['asdf', "pw\<NL>er", 'xxxx'],  out)
   else
-    let out = systemlist('more', bufnr('%'))
+    let out = systemlist('more.com', bufnr('%'))
     call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"],  out)
   endif
   bwipe!
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1276,
+/**/
     1275,
 /**/
     1274,