IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.220

Browse Source 
Problem:    Test 105 does not work in a shadow dir. (James McCoy)
Solution:   Omit "src/" from the checked path.

https://code.google.com/p/vim/source/detail?r=v7-4-220
This commit is contained in:
Pavel Platto 2014-08-22 10:50:30 +03:00
parent fd46f22d01
commit fc2020a140
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/testdir/test105.in
View File

@ -7,7 +7,7 @@ STARTTEST
:set shellslash :set shellslash
:let tab="\t" :let tab="\t"
:command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr))) :command -nargs=1 Put :let expr=<q-args> | $put =expr.tab.strtrans(string(eval(expr)))
:let $HOME=fnamemodify('.', ':p:h:h:h:h') :let $HOME=fnamemodify('.', ':p:h:h:h')
:Put fnamemodify('.', ':p' )[-1:] :Put fnamemodify('.', ':p' )[-1:]
:Put fnamemodify('.', ':p:h' )[-1:] :Put fnamemodify('.', ':p:h' )[-1:]
:Put fnamemodify('test.out', ':p' )[-1:] :Put fnamemodify('test.out', ':p' )[-1:]
@ -23,7 +23,7 @@ STARTTEST
:Put fnamemodify('abc.fb2.tar.gz', ':r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r' )
:Put fnamemodify('abc.fb2.tar.gz', ':r:r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r' )
:Put fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) :Put fnamemodify('abc.fb2.tar.gz', ':r:r:r' )
:Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') :Put substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '')
:Put fnamemodify('abc.fb2.tar.gz', ':e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e' )
:Put fnamemodify('abc.fb2.tar.gz', ':e:e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e' )
:Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' )

6
src/nvim/testdir/test105.ok
View File

@ -3,8 +3,8 @@ fnamemodify('.', ':p:h' )[-1:] 'r'
fnamemodify('test.out', ':p' )[-1:] 't' fnamemodify('test.out', ':p' )[-1:] 't'
fnamemodify('test.out', ':.' ) 'test.out' fnamemodify('test.out', ':.' ) 'test.out'
fnamemodify('../testdir/a', ':.' ) 'a' fnamemodify('../testdir/a', ':.' ) 'a'
fnamemodify('test.out', ':~' ) '~/src/nvim/testdir/test.out' fnamemodify('test.out', ':~' ) '~/nvim/testdir/test.out'
fnamemodify('../testdir/a', ':~' ) '~/src/nvim/testdir/a' fnamemodify('../testdir/a', ':~' ) '~/nvim/testdir/a'
fnamemodify('../testdir/a', ':t' ) 'a' fnamemodify('../testdir/a', ':t' ) 'a'
fnamemodify('.', ':p:t' ) '' fnamemodify('.', ':p:t' ) ''
fnamemodify('test.out', ':p:t' ) 'test.out' fnamemodify('test.out', ':p:t' ) 'test.out'
@ -13,7 +13,7 @@ fnamemodify('test.out', ':p:t:e' ) 'out'
fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar' fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar'
fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2' fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2'
fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc' fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc'
substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(src/nvim/testdir/.*\)', '\1', '') 'src/nvim/testdir/abc.fb2' substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') 'nvim/testdir/abc.fb2'
fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz' fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz'
fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz'
fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz'

2
src/nvim/version.c
View File

@ -375,7 +375,7 @@ static int included_patches[] = {
//223 NA //223 NA
//222 NA //222 NA
221, 221,
//220, 220,
219, 219,
218, 218,
//217 NA //217 NA