changeset 29052:e91e749ac101 v8.2.5048

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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 31 May 2022 18:15:03 +0200
parents 0b695d368511
children 22daa4bc6cf3
files src/testdir/test_gui.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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'))
--- 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,