gistfile1.diff

diff --git a/src/os_win32.c b/src/os_win32.c
index 6981d2f..57feae6 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4614,18 +4614,31 @@ mch_system(char *cmd, int options)
     int ret;
 
     /*
-     * Restore non-termcap screen buffer before execute external program, and
-     * revert it after.  Because msys and msys2's programs will cause freeze
-     * or crash conhost.exe (Windows's console window provider) and vim.exe,
-     * if active screen buffer is vim's one on Windows7.
+     * Call DuplicateHandle before execute external program. Because msys and
+     * msys2's programs will call CreateConsoleScreenBuffer and CloseHandle.
+     * CreateConsoleScreenBuffer return same handle which created by vim.
+     * So it occurs crash. This workaround is required on Windows7.
      */
+    HANDLE hTemp = INVALID_HANDLE_VALUE;
     if (is_win7 && g_fTermcapMode)
-	SetConsoleActiveScreenBuffer(g_cbNonTermcap.handle);
+    {
+	if (DuplicateHandle(
+		    GetCurrentProcess(),
+		    g_hConOut,
+		    GetCurrentProcess(),
+		    &hTemp,
+		    0,
+		    TRUE,DUPLICATE_SAME_ACCESS)) {
+	    SetConsoleActiveScreenBuffer(hTemp);
+	}
+    }
 
     ret = mch_system1(cmd, options);
 
-    if (is_win7 && g_fTermcapMode)
-	SetConsoleActiveScreenBuffer(g_cbTermcap.handle);
+    if (hTemp != INVALID_HANDLE_VALUE) {
+	SetConsoleActiveScreenBuffer(g_hConOut);
+	CloseHandle(hTemp);
+    }
 
     return ret;
 }