diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-13 03:06:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 03:06:12 +0100 |
| commit | 3f555cce3de595902cd003cfca008563bc8ff8da (patch) | |
| tree | cd7c87f8fdc7c7aaa369727ccd29efc20db36eb6 | |
| parent | 71d4b81b4cca76cf4c60105460e1ecbc09d9e86b (diff) | |
| parent | 013a9f9a04d17a7000089c1e6560bff340ff47f2 (diff) | |
| download | rneovim-3f555cce3de595902cd003cfca008563bc8ff8da.tar.gz rneovim-3f555cce3de595902cd003cfca008563bc8ff8da.tar.bz2 rneovim-3f555cce3de595902cd003cfca008563bc8ff8da.zip | |
Merge #6261 from lonerover/vim-ac80999
vim-patch: ac80999,7.4.2185,7.4.2187,7.4.2196
| -rw-r--r-- | src/nvim/testdir/test_glob2regpat.vim | 30 | ||||
| -rw-r--r-- | src/nvim/version.c | 6 |
2 files changed, 33 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/src/nvim/testdir/test_glob2regpat.vim new file mode 100644 index 0000000000..fdf17946b6 --- /dev/null +++ b/src/nvim/testdir/test_glob2regpat.vim @@ -0,0 +1,30 @@ +" Test glob2regpat() + +func Test_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() + call assert_equal('^foo\.', glob2regpat('foo.*')) + call assert_equal('^foo.$', glob2regpat('foo?')) + call assert_equal('\.vim$', glob2regpat('*.vim')) + call assert_equal('^[abc]$', glob2regpat('[abc]')) + call assert_equal('^foo bar$', glob2regpat('foo\ bar')) + call assert_equal('^foo,bar$', glob2regpat('foo,bar')) + call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}')) + call assert_equal('.*', glob2regpat('**')) + + if exists('+shellslash') + call assert_equal('^foo[\/].$', glob2regpat('foo\?')) + call assert_equal('^\(foo[\/]\|bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}')) + call assert_equal('^[\/]\(foo\|bar[\/]\)$', glob2regpat('\{foo,bar\}')) + call assert_equal('^[\/][\/]\(foo\|bar[\/][\/]\)$', glob2regpat('\\{foo,bar\\}')) + else + call assert_equal('^foo?$', glob2regpat('foo\?')) + call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}')) + call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}')) + call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}')) + endif +endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index c4d31c4abe..cc1483cc70 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -244,7 +244,7 @@ static int included_patches[] = { // 2199 NA // 2198 NA 2197, - // 2196, + 2196, // 2195 NA 2194, // 2193 NA @@ -253,9 +253,9 @@ static int included_patches[] = { // 2190, // 2189, 2188, - // 2187, + 2187, // 2186 NA - // 2185, + 2185, // 2184, 2183, // 2182 NA |