diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:36:34 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-12 11:37:31 +0800 |
| commit | a4b57c2089643545d6dca460b9f7c52ba850adc6 (patch) | |
| tree | fb9a08a71914cb12241e43cf41361992a0007a05 | |
| parent | 9f13983de280c53971a8997ead0d6e9d4e3d3e42 (diff) | |
| download | rneovim-a4b57c2089643545d6dca460b9f7c52ba850adc6.tar.gz rneovim-a4b57c2089643545d6dca460b9f7c52ba850adc6.tar.bz2 rneovim-a4b57c2089643545d6dca460b9f7c52ba850adc6.zip | |
vim-patch:7.4.2187
Problem: glob2regpat test fails on Windows.
Solution: Remove the checks that use backslashes.
https://github.com/vim/vim/commit/7547a78446c1a3c04b36c0533f0f046188bd378b
| -rw-r--r-- | src/nvim/testdir/test_glob2regpat.vim | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/src/nvim/testdir/test_glob2regpat.vim index 52d8a33279..16d7224256 100644 --- a/src/nvim/testdir/test_glob2regpat.vim +++ b/src/nvim/testdir/test_glob2regpat.vim @@ -9,14 +9,18 @@ endfunc func Test_valid() call assert_equal('^foo\.', glob2regpat('foo.*')) 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('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}')) - call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}')) - call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}')) call assert_equal('.*', glob2regpat('**')) + + if has('unix') + 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 37a91a3933..5851fb7779 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -253,7 +253,7 @@ static int included_patches[] = { // 2190, // 2189, 2188, - // 2187, + 2187, // 2186 NA 2185, // 2184, |