To: vim_dev@googlegroups.com
Subject: Patch 8.2.2234
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2234
Problem:    Command line wildmenu test often fails with Unix GUI.
Solution:   Skip the test where it is expected to fail.
Files:      src/testdir/test_cmdline.vim


*** ../vim-8.2.2233/src/testdir/test_cmdline.vim	2020-12-26 12:06:50.584655332 +0100
--- src/testdir/test_cmdline.vim	2020-12-28 13:40:21.947227283 +0100
***************
*** 58,75 ****
    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>
  
    " Test for canceling the wild menu by adding a character
    redrawstatus
--- 58,78 ----
    call feedkeys(":e Xdir1/\<Tab>\<Down>\<Up>\<Right>\<CR>", 'tx')
    call assert_equal('testfile1', getline(1))
  
!   " 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
*** ../vim-8.2.2233/src/version.c	2020-12-28 12:56:54.179617297 +0100
--- src/version.c	2020-12-28 13:41:16.147037479 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2234,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
37. You start looking for hot HTML addresses in public restrooms.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///