diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-23 14:51:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-23 14:51:02 +0200 |
| commit | 4cc45a367363f7754dedd280cd7a065b7a220394 (patch) | |
| tree | 540c840202f315ea30b8f09a300832838a8b5987 | |
| parent | 5a67c37a554daa7627bdf0c8e7ddd5f1b597f978 (diff) | |
| download | vim-git-4cc45a367363f7754dedd280cd7a065b7a220394.tar.gz | |
patch 8.2.1276: MS-Windows: system test may fail if more.exe is installedv8.2.1276
Problem: MS-Windows: system test may fail if more.exe is installed.
Solution: Explicitly use more.com. (Taro Muraoka, Ken Takata, closes #6517)
| -rw-r--r-- | src/testdir/test_system.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim index d59787389..9e63f5186 100644 --- 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! diff --git a/src/version.c b/src/version.c index 3489c45ba..e0115c649 100644 --- 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, |