To: vim_dev@googlegroups.com Subject: Patch 8.2.1276 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: src/testdir/test_system.vim *** ../vim-8.2.1275/src/testdir/test_system.vim 2020-05-07 18:43:40.867365982 +0200 --- src/testdir/test_system.vim 2020-07-23 14:49:36.499036360 +0200 *************** *** 13,21 **** 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"])) endif new Xdummy --- 13,21 ---- else call assert_equal("123\n", system('echo 123')) call assert_equal(["123\r"], systemlist('echo 123')) ! 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,48 **** let out = systemlist('cat', bufnr('%')) call assert_equal(['asdf', "pw\er", 'xxxx'], out) else ! let out = systemlist('more', bufnr('%')) call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out) endif bwipe! --- 42,48 ---- let out = systemlist('cat', bufnr('%')) call assert_equal(['asdf', "pw\er", 'xxxx'], out) else ! let out = systemlist('more.com', bufnr('%')) call assert_equal(["asdf\r", "pw\r", "er\r", "xxxx\r"], out) endif bwipe! *** ../vim-8.2.1275/src/version.c 2020-07-23 14:39:43.329828840 +0200 --- src/version.c 2020-07-23 14:50:46.754719940 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1276, /**/ -- hundred-and-one symptoms of being an internet addict: 67. Your hard drive crashes. You haven't logged in for two hours. You start to twitch. You pick up the phone and manually dial your ISP's access number. You try to hum to communicate with the modem. You succeed. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///