From 1e82a784ace6d2c4dce594dd6156bcb0028bba9e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Sep 2019 22:57:06 +0200 Subject: [PATCH] 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) --- src/testdir/test_popupwin.vim | 2 +- src/testdir/test_terminal.vim | 2 ++ src/version.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 6f7cae6c6751a..11e554fe748a5 100644 --- 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 810dc5fc27154..b354115e1685c 100644 --- 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 aade922ba6933..84add983415e3 100644 --- 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, /**/