diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-08 23:26:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-08 23:26:51 +0200 |
| commit | 7547a78446c1a3c04b36c0533f0f046188bd378b (patch) | |
| tree | c91e213e634ac02d6ab68c4c76686738e7fd9b34 | |
| parent | 36d1c0fef4039fd4c91643c8ac107e78115158c9 (diff) | |
| download | vim-git-7.4.2187.tar.gz | |
patch 7.4.2187v7.4.2187
Problem: glob2regpat test fails on Windows.
Solution: Remove the checks that use backslashes.
| -rw-r--r-- | src/testdir/test_glob2regpat.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/testdir/test_glob2regpat.vim b/src/testdir/test_glob2regpat.vim index 52d8a3327..16d722425 100644 --- a/src/testdir/test_glob2regpat.vim +++ b/src/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/version.c b/src/version.c index 0a53260b1..100cf55c7 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2187, +/**/ 2186, /**/ 2185, |