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 #6517)
diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim
index d597873..9e63f51 100644
--- a/src/testdir/test_system.vim
+++ b/src/testdir/test_system.vim
@@ -13,9 +13,9 @@
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 @@
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!
diff --git a/src/version.c b/src/version.c
index 3489c45..e0115c6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1276,
+/**/
1275,
/**/
1274,