To: vim_dev@googlegroups.com
Subject: Patch 8.1.2030
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.1.2030
Problem:    Tests fail when build with normal features and terminal.
            (Dominique Pelle)
Solution:   Disable tests that won't work. (closes #4932)
Files:	    src/testdir/test_popupwin.vim, src/testdir/test_terminal.vim


*** ../vim-8.1.2029/src/testdir/test_popupwin.vim	2019-09-08 17:11:39.350869449 +0200
--- src/testdir/test_popupwin.vim	2019-09-14 21:15:06.771459511 +0200
***************
*** 1136,1141 ****
--- 1136,1142 ----
  
  func Test_popup_beval()
    CheckScreendump
+   CheckFeature balloon_eval
  
    let lines =<< trim END
  	call setline(1, range(1, 20))
*** ../vim-8.1.2029/src/testdir/test_terminal.vim	2019-09-08 22:57:11.488090061 +0200
--- src/testdir/test_terminal.vim	2019-09-14 21:20:15.262147540 +0200
***************
*** 1684,1695 ****
    call feedkeys("\<C-W>w", 'tx')
    call assert_equal(termwin, win_getid())
  
!   set langmap=xjyk
!   call feedkeys("\<C-L>x", 'tx')
!   call assert_equal(thiswin, win_getid())
!   call feedkeys("\<C-W>y", 'tx')
!   call assert_equal(termwin, win_getid())
!   set langmap=
  
    call feedkeys("\<C-L>gt", "xt")
    call assert_equal(3, tabpagenr())
--- 1684,1697 ----
    call feedkeys("\<C-W>w", 'tx')
    call assert_equal(termwin, win_getid())
  
!   if has('langmap')
!     set langmap=xjyk
!     call feedkeys("\<C-L>x", 'tx')
!     call assert_equal(thiswin, win_getid())
!     call feedkeys("\<C-W>y", 'tx')
!     call assert_equal(termwin, win_getid())
!     set langmap=
!   endif
  
    call feedkeys("\<C-L>gt", "xt")
    call assert_equal(3, tabpagenr())
*** ../vim-8.1.2029/src/version.c	2019-09-14 21:00:01.387100866 +0200
--- src/version.c	2019-09-14 21:20:52.221989371 +0200
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     2030,
  /**/

-- 
Place mark here ->[ ]<- if you want a dirty monitor.

 /// 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    ///