Skip to content

Commit 7547a78

Browse files
committed
patch 7.4.2187
Problem: glob2regpat test fails on Windows. Solution: Remove the checks that use backslashes.
1 parent 36d1c0f commit 7547a78

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

src/testdir/test_glob2regpat.vim

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ endfunc
99
func Test_valid()
1010
call assert_equal('^foo\.', glob2regpat('foo.*'))
1111
call assert_equal('^foo.$', glob2regpat('foo?'))
12-
call assert_equal('^foo?$', glob2regpat('foo\?'))
1312
call assert_equal('\.vim$', glob2regpat('*.vim'))
1413
call assert_equal('^[abc]$', glob2regpat('[abc]'))
1514
call assert_equal('^foo bar$', glob2regpat('foo\ bar'))
1615
call assert_equal('^foo,bar$', glob2regpat('foo,bar'))
1716
call assert_equal('^\(foo\|bar\)$', glob2regpat('{foo,bar}'))
18-
call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
19-
call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}'))
20-
call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}'))
2117
call assert_equal('.*', glob2regpat('**'))
18+
19+
if has('unix')
20+
call assert_equal('^foo?$', glob2regpat('foo\?'))
21+
call assert_equal('^\(foo,bar\|foobar\)$', glob2regpat('{foo\,bar,foobar}'))
22+
call assert_equal('^{foo,bar}$', glob2regpat('\{foo,bar\}'))
23+
call assert_equal('^\\\(foo\|bar\\\)$', glob2regpat('\\{foo,bar\\}'))
24+
" todo: Windows
25+
endif
2226
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2187,
766768
/**/
767769
2186,
768770
/**/

0 commit comments

Comments
 (0)