patch 8.1.2063: some tests fail when +balloon_eval_term is missing

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)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 6f7cae6c6751ad001a2c34935a96573ffcdc3e9a..11e554fe748a5f59b2e723897dd634b1e65893fd 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1137,7 +1137,7 @@ endfunc
 
 func Test_popup_beval()
   CheckScreendump
-  CheckFeature balloon_eval
+  CheckFeature balloon_eval_term
 
   let lines =<< trim END
        call setline(1, range(1, 20))

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 810dc5fc27154f51fc9c52cc9b141b220fa2a16b..b354115e1685c227421f82156f73131fa37aa898 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1466,6 +1466,7 @@ let s:test_colors = [
        \]
 
 func Test_terminal_ansicolors_global()
+  CheckFeature termguicolors
   if !exists('*term_getansicolors')
     throw 'Skipped: term_getansicolors() not supported'
   endif
@@ -1480,6 +1481,7 @@ func Test_terminal_ansicolors_global()
 endfunc
 
 func Test_terminal_ansicolors_func()
+  CheckFeature termguicolors
   if !exists('*term_getansicolors')
     throw 'Skipped: term_getansicolors() not supported'
   endif

diff --git a/src/version.c b/src/version.c
index aade922ba693302da751308d0363bdc9536bfd54..84add983415e3b1f6130779d8d76f466bb368644 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2063,
 /**/
     2062,
 /**/