summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-19 18:20:45 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-19 18:20:45 +0100
commite25bbc3b2bf1d8c4acec0910aaf9031451752578 (patch)
treeb9efccffa8e019e1dae3b7d99133365175d4563d
parent32526b3c1846025f0e655f41efd4e5428da16b6c (diff)
downloadvim-git-e25bbc3b2bf1d8c4acec0910aaf9031451752578.tar.gz
patch 8.1.0780: terminal test fails on Macv8.1.0780
Problem: Terminal test fails on Mac. Solution: Skip the test on Mac.
-rw-r--r--src/testdir/test_terminal.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 0e0c76c02..f78d66ca2 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -643,8 +643,9 @@ func Test_terminal_write_stdin()
endfunc
func Test_terminal_no_cmd()
+ " Does not work on Mac.
" Todo: make this work on Win32 again
- if has('win32')
+ if has('mac') || has('win32')
return
endif
let buf = term_start('NONE', {})
diff --git a/src/version.c b/src/version.c
index f6f3b3a28..946a6a2df 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 */
/**/
+ 780,
+/**/
779,
/**/
778,