diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-23 04:49:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-23 04:49:23 +0200 |
| commit | cd96eef3a869557bd3d2d4497861d87cb525db06 (patch) | |
| tree | b549daf6453a3a9714e634fa7bd2a2291fd9462e | |
| parent | 9cf4b5005f12ce1d6692266140bdda05d0312d79 (diff) | |
| download | vim-git-cd96eef3a869557bd3d2d4497861d87cb525db06.tar.gz | |
patch 8.1.0206: duplicate test function namev8.1.0206
Problem: Duplicate test function name.
Solution: Rename both functions.
| -rw-r--r-- | src/testdir/test_glob2regpat.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_modeline.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_glob2regpat.vim b/src/testdir/test_glob2regpat.vim index fdf17946b..e6e41f13e 100644 --- a/src/testdir/test_glob2regpat.vim +++ b/src/testdir/test_glob2regpat.vim @@ -1,12 +1,12 @@ " Test glob2regpat() -func Test_invalid() +func Test_glob2regpat_invalid() call assert_fails('call glob2regpat(1.33)', 'E806:') call assert_fails('call glob2regpat("}")', 'E219:') call assert_fails('call glob2regpat("{")', 'E220:') endfunc -func Test_valid() +func Test_glob2regpat_valid() call assert_equal('^foo\.', glob2regpat('foo.*')) call assert_equal('^foo.$', glob2regpat('foo?')) call assert_equal('\.vim$', glob2regpat('*.vim')) diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim index 6e49577e0..e278c1613 100644 --- a/src/testdir/test_modeline.vim +++ b/src/testdir/test_modeline.vim @@ -1,6 +1,6 @@ " Tests for parsing the modeline. -func Test_invalid() +func Test_modeline_invalid() " This was reading before allocated memory. call writefile(['vi:0', 'nothing'], 'Xmodeline') call assert_fails('split Xmodeline', 'E518:') diff --git a/src/version.c b/src/version.c index 23fea92c6..36e2fcbc4 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 206, +/**/ 205, /**/ 204, |