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)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index d651d0bbaa5b6956a89d0ceb1f98da487ca6bcfe..ae6d195ab9c0d38627df18deee1d9a9387006cbd 100644 (file)
--- 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 b9836b7beb73ea91ee26fcbb91d169d64b35a0d0..0ef208437ae946f13c073317c7c444924d2d0e90 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 */
+/**/
+    1011,
 /**/
     1010,
 /**/