summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-19 15:27:08 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-19 15:27:08 +0100
commitd383c92ec1d14ffd5c3802f0ffd763e91d547fa8 (patch)
tree99d9e2580875c47a54a5b4ef6f441f7c32268b8b
parentb091f30bf38eacb31b9d8c97c82c7e0af9866301 (diff)
patch 8.1.0778: terminal test fails on MS-Windowsv8.1.0778
Problem: Terminal test fails on MS-Windows. Solution: Temporarily skip the test on MS-Windows. Do run it both in terminal and GUI on other systems.
-rw-r--r--src/testdir/test_terminal.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index b2690aed0a..0e0c76c02c 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -643,8 +643,8 @@ func Test_terminal_write_stdin()
endfunc
func Test_terminal_no_cmd()
- " Todo: make this work in the GUI
- if !has('gui_running')
+ " Todo: make this work on Win32 again
+ if has('win32')
return
endif
let buf = term_start('NONE', {})
diff --git a/src/version.c b/src/version.c
index a83bad6e1d..3a1369ce21 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 778,
+/**/
777,
/**/
776,