To: vim_dev@googlegroups.com Subject: Patch 8.1.2256 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2256 (after 8.1.2255) Problem: Test for ":term ++shell" fails on MS-Windows. Solution: Accept failure of "dir" executable. Files: src/testdir/test_terminal.vim *** ../vim-8.1.2255/src/testdir/test_terminal.vim 2019-11-04 23:18:31.431027128 +0100 --- src/testdir/test_terminal.vim 2019-11-04 23:34:48.447643158 +0100 *************** *** 2227,2233 **** elseif has('win32') " dir is a shell builtin command, should fail without a shell. term dir /b runtest.vim ! call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))}) bwipe! term ++shell dir /b runtest.vim --- 2227,2233 ---- elseif has('win32') " dir is a shell builtin command, should fail without a shell. term dir /b runtest.vim ! call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))}) bwipe! term ++shell dir /b runtest.vim *** ../vim-8.1.2255/src/version.c 2019-11-04 23:18:31.431027128 +0100 --- src/version.c 2019-11-04 23:36:08.315362324 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2256, /**/ -- What a wonderfully exciting cough! Do you mind if I join you? -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// 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 ///