patch 8.0.0958: terminal test fails on Windows when winpty dll is missing

Problem:    The terminal test fails on MS-Windows when compiled with the
            terminal feature but the winpty DLL is missing.
Solution:   Check if the terminal feature works. (Ken Takata)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index c75d07f2b3e8540659ad87928a1b135079fd8c7a..64104abebea09d5462eed3b5eeb2fb87e6b82ea5 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1,6 +1,6 @@
 " Tests for the terminal window.
 
-if !exists('*term_start')
+if !has('terminal')
   finish
 endif
 

diff --git a/src/version.c b/src/version.c
index 9d12b1efb2913417375378b2293fddf35c2471d8..903b13ee5b4d322b06be8e3556c0f5795c9f1cfc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    958,
 /**/
     957,
 /**/