diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-31 17:03:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-31 17:03:14 +0100 |
| commit | b5912e0643dc21b1b88c517d3ac1282eba57293d (patch) | |
| tree | 2d97982252760c62c5e046c7ce04ff6f9623a5ac | |
| parent | 368137aa525982984beed73940af481ac53a62af (diff) | |
| download | vim-git-b5912e0643dc21b1b88c517d3ac1282eba57293d.tar.gz | |
patch 8.2.5048: when using XIM the gui test may failv8.2.5048
Problem: When using XIM the gui test may fail.
Solution: Only use --not-a-term when not using XIM.
| -rw-r--r-- | src/testdir/test_gui.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
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 @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5048, +/**/ 5047, /**/ 5046, |