From b5912e0643dc21b1b88c517d3ac1282eba57293d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 31 May 2022 17:03:14 +0100 Subject: 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. --- src/testdir/test_gui.vim | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 2c08340ff..96fed7c1f 100644 --- 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 db2a5b22c..ac335516b 100644 --- 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, /**/ -- cgit v1.2.1