diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-30 14:26:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-30 14:26:58 +0200 |
| commit | 660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997 (patch) | |
| tree | 46cbda71c0d5c384693235d7996c297f43bc3c95 /src | |
| parent | a5e6621aadadf78c7b344e93a4b328788076f14c (diff) | |
| download | vim-660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997.zip | |
patch 8.0.1162: shared script for tests cannot be included twice
Problem: Shared script for tests cannot be included twice.
Solution: Include it where needed, it will "finish" if loaded again.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_alot.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_bufline.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_timers.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 61c3472b2..189cd82d1 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -1,8 +1,6 @@ " A series of tests that can run in one Vim invocation. " This makes testing go faster, since Vim doesn't need to restart. -source shared.vim - set belloff=all source test_assign.vim source test_bufline.vim diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim index f57dd73ef..cc5c10e98 100644 --- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -1,8 +1,6 @@ " Tests for setbufline() and getbufline() -if !exists('*GetVimCommand') - source shared.vim -endif +source shared.vim func Test_setbufline_getbufline() new diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index 768eeade8..c8b25c63b 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -4,9 +4,7 @@ if !has('timers') finish endif -if !exists('*WaitFor') - source shared.vim -endif +source shared.vim func MyHandler(timer) let g:val += 1 diff --git a/src/version.c b/src/version.c index 804f84c68..778046b95 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1162, +/**/ 1161, /**/ 1160, |