diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-08-25 01:52:30 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-08-25 01:52:30 -0400 |
| commit | 665c3cc3345ed766bf085a841806d6f0606ee12a (patch) | |
| tree | c02ffe37351d17bb4fa449c55236688c83c3217b | |
| parent | 92d27b7290914585f11d3a07e9bbbc504b8c9ca1 (diff) | |
| parent | fc2020a1403203ec7817c62cff0cfe0e7b93d9b7 (diff) | |
| download | rneovim-665c3cc3345ed766bf085a841806d6f0606ee12a.tar.gz rneovim-665c3cc3345ed766bf085a841806d6f0606ee12a.tar.bz2 rneovim-665c3cc3345ed766bf085a841806d6f0606ee12a.zip | |
Merge pull request #1104 from Hinidu/vim-patch-7.4.220
vim-patch:7.4.220
| -rw-r--r-- | src/nvim/testdir/test105.in | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test105.ok | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/testdir/test105.in b/src/nvim/testdir/test105.in index 73d92e899d..bfb4b65fbb 100644 --- a/src/nvim/testdir/test105.in +++ b/src/nvim/testdir/test105.in @@ -7,7 +7,7 @@ STARTTEST :set shellslash :let tab="\t" :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:h' )[-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: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:e' ) :Put fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) diff --git a/src/nvim/testdir/test105.ok b/src/nvim/testdir/test105.ok index be1eca8f8f..0b30ee4281 100644 --- a/src/nvim/testdir/test105.ok +++ b/src/nvim/testdir/test105.ok @@ -3,8 +3,8 @@ fnamemodify('.', ':p:h' )[-1:] 'r' fnamemodify('test.out', ':p' )[-1:] 't' fnamemodify('test.out', ':.' ) 'test.out' fnamemodify('../testdir/a', ':.' ) 'a' -fnamemodify('test.out', ':~' ) '~/src/nvim/testdir/test.out' -fnamemodify('../testdir/a', ':~' ) '~/src/nvim/testdir/a' +fnamemodify('test.out', ':~' ) '~/nvim/testdir/test.out' +fnamemodify('../testdir/a', ':~' ) '~/nvim/testdir/a' fnamemodify('../testdir/a', ':t' ) 'a' fnamemodify('.', ':p:t' ) '' 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:r' ) 'abc.fb2' 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:e' ) 'tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz' diff --git a/src/nvim/version.c b/src/nvim/version.c index 12ee8c1e2c..b164f94bb1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -375,7 +375,7 @@ static int included_patches[] = { //223 NA //222 NA 221, - //220, + 220, 219, 218, //217 NA |