patch 8.2.5048: when using XIM the gui test may fail

Problem:    When using XIM the gui test may fail.
Solution:   Only use --not-a-term when not using XIM.

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 2c08340ffc24f576925e788f3a3666a2c6a341c4..96fed7c1fd0a599ca0c5ecc6e60984229fc772f2 100644 (file)
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -159,7 +159,12 @@ func Test_gui_read_stdin()
 
   " Cannot use --not-a-term here, the "reading from stdin" message would not be
   " displayed.
-  let vimcmd = substitute(GetVimCommand(), '--not-a-term', '', '')
+  " However, when using XIM we might get E285, do use it then.
+  if has('xim')
+    let vimcmd = GetVimCommand()
+  else
+    let vimcmd = substitute(GetVimCommand(), '--not-a-term', '', '')
+  endif
 
   call system('cat Xstdin | ' .. vimcmd .. ' -f -g -S Xscript -')
   call assert_equal(['some', 'lines'], readfile('XstdinOK'))

diff --git a/src/version.c b/src/version.c
index db2a5b22c7fb9ad1ad79b5b6faa2a5a7dc1d3acb..ac335516b3e1024ddaad5b7d85d090ed096e8784 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5048,
 /**/
     5047,
 /**/