summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-18 21:07:11 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-18 21:07:11 +0200
commitea5d6fadbbba614e51e819cb537a3d52600bfcc5 (patch)
treeb1b1a0993834075ec13b0fdfee7e05ce32efaf78
parent97bd5e6527bf2b48acdd1550acba161e82a5bc99 (diff)
downloadvim-ea5d6fadbbba614e51e819cb537a3d52600bfcc5.zip
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)
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index c75d07f2b..64104abeb 100644
--- 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 9d12b1efb..903b13ee5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 958,
+/**/
957,
/**/
956,