diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-08-29 20:42:07 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-08-29 20:42:07 +0200 |
commit | 97f65fafdbf3530fa42d6e43618e66e14c866b50 (patch) | |
tree | acc04906c0db68734e186b22019e75f9010dc117 | |
parent | 3c37a8e66008aadfe428a32ecf46aab4b9e285ae (diff) | |
download | vim-97f65fafdbf3530fa42d6e43618e66e14c866b50.zip |
patch 8.0.1011: terminal test fails with Athena and Motif
Problem: Terminal test fails with Athena and Motif.
Solution: Ignore the error for the input context. (Kazunobu Kuriyama)
-rw-r--r-- | src/testdir/test_terminal.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index d651d0bba..ae6d195ab 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -429,6 +429,10 @@ func Test_zz_terminal_in_gui() if !CanRunGui() return endif + + " Ignore the "failed to create input context" error. + call test_ignore_error('E285:') + gui -f call assert_equal(1, winnr('$')) diff --git a/src/version.c b/src/version.c index b9836b7be..0ef208437 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 */ /**/ + 1011, +/**/ 1010, /**/ 1009, |