Patch 8.2.5048

[Bram Moolenaar]

Patch 8.2.5048
Problem: When using XIM the gui test may fail.
Solution: Only use --not-a-term when not using XIM.
Files: src/testdir/test_gui.vim


*** ../vim-8.2.5047/src/testdir/test_gui.vim 2022-05-16 17:07:37.972022108 +0100
--- src/testdir/test_gui.vim 2022-05-31 17:01:32.859798160 +0100
***************
*** 159,165 ****

" Cannot use --not-a-term here, the "reading from stdin" message would not be
" displayed.
! let vimcmd = substitute(GetVimCommand(), '--not-a-term', '', '')

call system('cat Xstdin | ' .. vimcmd .. ' -f -g -S Xscript -')
call assert_equal(['some', 'lines'], readfile('XstdinOK'))
--- 159,170 ----

" Cannot use --not-a-term here, the "reading from stdin" message would not be
" displayed.
! " 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'))
*** ../vim-8.2.5047/src/version.c 2022-05-31 13:42:54.834788844 +0100
--- src/version.c 2022-05-31 17:02:36.263736931 +0100
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 5048,
/**/

--
ARTHUR: Well, I can't just call you `Man'.
DENNIS: Well, you could say `Dennis'.
ARTHUR: Well, I didn't know you were called `Dennis.'
DENNIS: Well, you didn't bother to find out, did you?
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///