diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_memory_usage.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_memory_usage.vim b/src/testdir/test_memory_usage.vim index 23dcc62acb..b70d2d03f0 100644 --- a/src/testdir/test_memory_usage.vim +++ b/src/testdir/test_memory_usage.vim @@ -137,7 +137,9 @@ func Test_memory_func_capture_lvars() let last = s:monitor_memory_usage(vim.pid).last endfor - call assert_inrange(before, after.max + (after.last - before), last) + " The usage may be a bit less than the last value + let lower = before * 8 / 10 + call assert_inrange(lower, after.max + (after.last - before), last) call vim.stop() call delete(testfile) diff --git a/src/version.c b/src/version.c index 6b578c828a..ee8a4d6dd4 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1027, +/**/ 1026, /**/ 1025, |