diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:39:09 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:40:38 +0800 |
| commit | 013a9f9a04d17a7000089c1e6560bff340ff47f2 (patch) | |
| tree | 99ea86a0674a886b7cd8819af7395551bb65b79c | |
| parent | a4b57c2089643545d6dca460b9f7c52ba850adc6 (diff) | |
| download | rneovim-013a9f9a04d17a7000089c1e6560bff340ff47f2.tar.gz rneovim-013a9f9a04d17a7000089c1e6560bff340ff47f2.tar.bz2 rneovim-013a9f9a04d17a7000089c1e6560bff340ff47f2.zip | |
vim-patch:7.4.2196
Problem: glob2regpat test doesn't test everything on MS-Windows.
Solution: Add patterns with backslash handling.
https://github.com/vim/vim/commit/91c5262b19fd2e558fe87b78c7767c7c5a270be8
| -rw-r--r-- | src/nvim/testdir/test_glob2regpat.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/src/nvim/testdir/test_glob2regpat.vim index 16d7224256..fdf17946b6 100644 --- a/src/nvim/testdir/test_glob2regpat.vim +++ b/src/nvim/testdir/test_glob2regpat.vim @@ -16,11 +16,15 @@ func Test_valid() call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}')) call assert_equal('.*', glob2regpat('**')) - if has('unix') + 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\\}')) - " todo: Windows endif endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index 5851fb7779..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 |