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 2c08340..96fed7c 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -159,7 +159,12 @@
" 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 db2a5b2..ac33551 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5048,
+/**/
5047,
/**/
5046,