summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-19 20:32:49 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-19 20:32:49 +0100
commit7221fce8b395972b57aea5f36ba2844fe1d4c259 (patch)
tree56ece8401fb0b96aa2fe44055824d05795897828 /src
parent669a828cdc1f019e7abda0e5e9b223d7897f06a8 (diff)
patch 8.0.1320: popup test fails on GUI-only buildv8.0.1320
Problem: Popup test fails on GUI-only build. Solution: Don't test balloon_split() when it's not available.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_popup.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index bfccb7410f..2bb9b32c49 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -704,6 +704,9 @@ func Test_popup_and_preview_autocommand()
endfunc
func Test_balloon_split()
+ if !exists('*balloon_split')
+ return
+ endif
call assert_equal([
\ 'one two three four one two three four one two thre',
\ 'e four',
diff --git a/src/version.c b/src/version.c
index 2e52e806cf..324a3601d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1320,
+/**/
1319,
/**/
1318,