From 3e112acc220dcacb58d77edca71910a532fffd0f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 28 Dec 2020 13:41:53 +0100
Subject: patch 8.2.2234: command line wildmenu test often fails with Unix GUI

Problem:    Command line wildmenu test often fails with Unix GUI.
Solution:   Skip the test where it is expected to fail.
---
 src/testdir/test_cmdline.vim | 27 +++++++++++++++------------
 src/version.c                |  2 ++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 0127c2974..2a6db7de4 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -58,18 +58,21 @@ func Test_complete_wildmenu()
   call feedkeys(":e Xdir1/\<Tab>\<Down>\<Up>\<Right>\<CR>", 'tx')
   call assert_equal('testfile1', getline(1))
 
-  +  " <C-J>/<C-K> mappings to go up/down directories when 'wildcharm' is
-  " different than 'wildchar'.
-  set wildcharm=<C-Z>
-  cnoremap <C-J> <Down><C-Z>
-  cnoremap <C-K> <Up><C-Z>
-  call feedkeys(":e Xdir1/\<Tab>\<C-J>\<CR>", 'tx')
-  call assert_equal('testfile3', getline(1))
-  call feedkeys(":e Xdir1/\<Tab>\<C-J>\<C-K>\<CR>", 'tx')
-  call assert_equal('testfile1', getline(1))
-  set wildcharm=0
-  cunmap <C-J>
-  cunmap <C-K>
+  " this fails in some Unix GUIs, not sure why
+  if !has('unix') || !has('gui_running')
+    " <C-J>/<C-K> mappings to go up/down directories when 'wildcharm' is
+    " different than 'wildchar'.
+    set wildcharm=<C-Z>
+    cnoremap <C-J> <Down><C-Z>
+    cnoremap <C-K> <Up><C-Z>
+    call feedkeys(":e Xdir1/\<Tab>\<C-J>\<CR>", 'tx')
+    call assert_equal('testfile3', getline(1))
+    call feedkeys(":e Xdir1/\<Tab>\<C-J>\<C-K>\<CR>", 'tx')
+    call assert_equal('testfile1', getline(1))
+    set wildcharm=0
+    cunmap <C-J>
+    cunmap <C-K>
+  endif
 
   " Test for canceling the wild menu by adding a character
   redrawstatus
diff --git a/src/version.c b/src/version.c
index 71bc47d04..4dfa98783 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2234,
 /**/
     2233,
 /**/
-- 
cgit v1.2.1