# HG changeset patch # User Christian Brabandt # Date 1532314805 -7200 # Node ID 8846b83444309722d72d62961e6eebe4df5846f2 # Parent c3c3a4560106dbe34ebd33ae73a5e0d100c281e1 patch 8.1.0206: duplicate test function name commit https://github.com/vim/vim/commit/cd96eef3a869557bd3d2d4497861d87cb525db06 Author: Bram Moolenaar Date: Mon Jul 23 04:49:23 2018 +0200 patch 8.1.0206: duplicate test function name Problem: Duplicate test function name. Solution: Rename both functions. diff --git a/src/testdir/test_glob2regpat.vim b/src/testdir/test_glob2regpat.vim --- 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 --- 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 --- 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,