To: vim_dev@googlegroups.com
Subject: Patch 8.1.2063`
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.2063
Problem:    Some tests fail when +balloon_eval_term is missing but
            _balloon_eval is present. (Dominique Pelle)
Solution:   Check the right feature in the test. (closes #4962)
Files:	    src/testdir/test_popupwin.vim, src/testdir/test_terminal.vim


*** ../vim-8.1.2062/src/testdir/test_popupwin.vim	2019-09-17 21:23:36.458822181 +0200
--- src/testdir/test_popupwin.vim	2019-09-21 22:35:31.262377875 +0200
***************
*** 1137,1143 ****
  
  func Test_popup_beval()
    CheckScreendump
!   CheckFeature balloon_eval
  
    let lines =<< trim END
  	call setline(1, range(1, 20))
--- 1137,1143 ----
  
  func Test_popup_beval()
    CheckScreendump
!   CheckFeature balloon_eval_term
  
    let lines =<< trim END
  	call setline(1, range(1, 20))
*** ../vim-8.1.2062/src/testdir/test_terminal.vim	2019-09-14 21:23:37.141281837 +0200
--- src/testdir/test_terminal.vim	2019-09-21 22:51:22.773925557 +0200
***************
*** 1466,1471 ****
--- 1466,1472 ----
  	\]
  
  func Test_terminal_ansicolors_global()
+   CheckFeature termguicolors
    if !exists('*term_getansicolors')
      throw 'Skipped: term_getansicolors() not supported'
    endif
***************
*** 1480,1485 ****
--- 1481,1487 ----
  endfunc
  
  func Test_terminal_ansicolors_func()
+   CheckFeature termguicolors
    if !exists('*term_getansicolors')
      throw 'Skipped: term_getansicolors() not supported'
    endif
*** ../vim-8.1.2062/src/version.c	2019-09-21 20:46:14.732275724 +0200
--- src/version.c	2019-09-21 22:36:43.814057238 +0200
***************
*** 759,760 ****
--- 759,762 ----
  {   /* Add new patch number below this line */
+ /**/
+     2063,
  /**/

-- 
FATHER: One day, lad, all this will be yours ...
PRINCE: What - the curtains?
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

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