thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1276: MS-Windows: system test may fail if more.exe is installed

Browse Source 
Problem:    MS-Windows: system test may fail if more.exe is installed.
Solution:   Explicitly use more.com. (Taro Muraoka, Ken Takata, closes #6517)
This commit is contained in:
Bram Moolenaar
2020-07-23 14:51:02 +02:00
parent 5a67c37a55
commit 4cc45a3673
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_system.vim
View File

@@ -13,9 +13,9 @@ func Test_System()
else else
call assert_equal("123\n", system('echo 123')) call assert_equal("123\n", system('echo 123'))
call assert_equal(["123\r"], systemlist('echo 123')) call assert_equal(["123\r"], systemlist('echo 123'))
call assert_equal("123\n", system('more', '123')) call assert_equal("123\n", system('more.com', '123'))
call assert_equal(["123\r"], systemlist('more', '123')) call assert_equal(["123\r"], systemlist('more.com', '123'))
call assert_equal(["as\r", "df\r"], systemlist('more', ["as\<NL>df"])) call assert_equal(["as\r", "df\r"], systemlist('more.com', ["as\<NL>df"]))
endif endif
new Xdummy new Xdummy
@@ -42,7 +42,7 @@ func Test_System()
let out = systemlist('cat', bufnr('%')) let out = systemlist('cat', bufnr('%'))
call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out) call assert_equal(['asdf', "pw\<NL>er", 'xxxx'], out)
else else
let out = systemlist('more', bufnr('%')) let out = systemlist('more.com', bufnr('%'))
call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out) call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out)
endif endif
bwipe! bwipe!

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1276,
/**/ /**/
1275, 1275,
/**/ /**/