# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1654013703 -7200
# Node ID e91e749ac101ba6b4238c2b6347977007ea97a36
# Parent  0b695d3685116c45a930ae939e1cdd161b3ca2cf
patch 8.2.5048: when using XIM the gui test may fail

Commit: https://github.com/vim/vim/commit/b5912e0643dc21b1b88c517d3ac1282eba57293d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue May 31 17:03:14 2022 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5048,
+/**/
     5047,
 /**/
     5046,