thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.2187

Browse Source 
Problem:    glob2regpat test fails on Windows.
Solution:   Remove the checks that use backslashes.
This commit is contained in:
Bram Moolenaar
2016-08-08 23:26:51 +02:00
parent 36d1c0fef4
commit 7547a78446
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/test_glob2regpat.vim
View File

@@ -9,14 +9,18 @@ endfunc
func Test_valid() func Test_valid()
call assert_equal('^foo\.', glob2regpat('foo.*')) call assert_equal('^foo\.', glob2regpat('foo.*'))
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('\.vim$', glob2regpat('*.vim'))
call assert_equal('^[abc]$', glob2regpat('[abc]')) 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$', 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('**')) 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 endfunc

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2187,
/**/ /**/
2186, 2186,
/**/ /**/