Mercurial > vim
changeset 12706:9b882316aa63 v8.0.1231
patch 8.0.1231: expanding file name drops dash
commit https://github.com/vim/vim/commit/c312b8b87a589ed8452dbf0f555f05ff86d04692
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 28 17:53:04 2017 +0200
patch 8.0.1231: expanding file name drops dash
Problem: Expanding file name drops dash. (stucki)
Solution: Use the right position. (Christian Brabandt, closes https://github.com/vim/vim/issues/2184)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Oct 2017 18:00:05 +0200 |
| parents | e10dd6f0b5d3 |
| children | f7c8b09dd510 |
| files | src/ex_docmd.c src/testdir/test_cmdline.vim src/version.c |
| diffstat | 3 files changed, 29 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10715,9 +10715,12 @@ eval_vars( if (*s == '<') /* "#<99" uses v:oldfiles */ ++s; i = (int)getdigits(&s); + if (s == src + 2 && src[1] == '-') + /* just a minus sign, don't skip over it */ + s--; *usedlen = (int)(s - src); /* length of what we expand */ - if (src[1] == '<') + if (src[1] == '<' && i != 0) { if (*usedlen < 2) { @@ -10740,6 +10743,8 @@ eval_vars( } else { + if (i == 0 && src[1] == '<' && *usedlen > 1) + *usedlen = 1; buf = buflist_findnr(i); if (buf == NULL) {
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -365,6 +365,27 @@ func Test_cmdline_complete_user_cmd() delcommand Foo endfunc +func Test_cmdline_write_alternatefile() + new + call setline('.', ['one', 'two']) + f foo.txt + new + f #-A + call assert_equal('foo.txt-A', expand('%')) + f #<-B.txt + call assert_equal('foo-B.txt', expand('%')) + f %< + call assert_equal('foo-B', expand('%')) + new + call assert_fails('f #<', 'E95') + bw! + f foo-B.txt + f %<-A + call assert_equal('foo-B-A', expand('%')) + bw! + bw! +endfunc + " using a leading backslash here set cpo+=C