# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1595965504 -7200
# Node ID 8c643335991355b8b9f6ca3b0568a0c912a4980f
# Parent  dd0324c033031ad813fbe4e2b61f21d80b4e2e10
patch 8.2.1312: MS-Windows: terminal test may fail if dir.exe exists

Commit: https://github.com/vim/vim/commit/066b12e36c32a87725303c0f71e968eb3f9a9f32
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jul 28 21:40:27 2020 +0200

    patch 8.2.1312: MS-Windows: terminal test may fail if dir.exe exists

    Problem:    MS-Windows: terminal test may fail if dir.exe exists.
    Solution:   Use dir.com. (Ken Takata, closes https://github.com/vim/vim/issues/6557)

diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -43,15 +43,18 @@ func Test_terminal_shell_option()
     bwipe!
   elseif has('win32')
     " dir is a shell builtin command, should fail without a shell.
+    " However, if dir.exe (which might be provided by Cygwin/MSYS2) exists in
+    " the %PATH%, "term dir" succeeds unintentionally.  Use dir.com instead.
     try
-      term dir /b runtest.vim
-      call WaitForAssert({-> assert_match('job failed\|cannot access .*: No such file or directory', term_getline(bufnr(), 1))})
+      term dir.com /b runtest.vim
+      call WaitForAssert({-> assert_match('job failed', term_getline(bufnr(), 1))})
     catch /CreateProcess/
       " ignore
     endtry
     bwipe!
 
-    term ++shell dir /b runtest.vim
+    " This should execute the dir builtin command even with ".com".
+    term ++shell dir.com /b runtest.vim
     call WaitForAssert({-> assert_match('runtest.vim', term_getline(bufnr(), 1))})
     bwipe!
   endif
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 */
 /**/
+    1312,
+/**/
     1311,
 /**/
     1310,