# HG changeset patch # User Bram Moolenaar # Date 1595509204 -7200 # Node ID 756562af426e86fa840f335bf70ad8811de8d65b # Parent d6c578125b04da4844d950a519df2d86b8da880e 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 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) diff --git a/src/testdir/test_system.vim b/src/testdir/test_system.vim --- 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\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\df"])) endif new Xdummy @@ -42,7 +42,7 @@ func Test_System() let out = systemlist('cat', bufnr('%')) call assert_equal(['asdf', "pw\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 --- 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,