summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-05 13:48:13 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-05 13:48:13 +0100
commit0f9ea22c115084a982c86214ef41200e0dfc1ea6 (patch)
tree49c65b7b5f21f9a907c767cbcd5e26b20938849f
parentd5841f28d4b041830af0f3314979f9b9093d1a77 (diff)
downloadvim-git-8.0.0415.tar.gz
patch 8.0.0415: balloon test fails on MS-Windowsv8.0.0415
Problem: Balloon test fails on MS-Windows. Solution: Test with 0x7fffffff instead of 0xffffffff.
-rw-r--r--src/testdir/test_gui.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 74720d9eb..7d39a1d40 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -155,9 +155,9 @@ func Test_set_balloondelay()
" Since p_bdelay is of type long currently, the upper bound can be
" impractically huge and machine-dependent. Practically, it's sufficient
- " to check if balloondelay works with 0xffffffff (32 bits) for now.
- set balloondelay=4294967295
- call assert_equal(4294967295, &balloondelay)
+ " to check if balloondelay works with 0x7fffffff (32 bits) for now.
+ set balloondelay=2147483647
+ call assert_equal(2147483647, &balloondelay)
let &balloondelay = balloondelay_saved
endfunc
diff --git a/src/version.c b/src/version.c
index 2e52f8451..dbb7df286 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 415,
+/**/
414,
/**/
413,