patch 8.0.1231: expanding file name drops dash
Problem: Expanding file name drops dash. (stucki)
Solution: Use the right position. (Christian Brabandt, closes #2184)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 036569f..547d1ac 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10715,9 +10715,12 @@
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 @@
}
else
{
+ if (i == 0 && src[1] == '<' && *usedlen > 1)
+ *usedlen = 1;
buf = buflist_findnr(i);
if (buf == NULL)
{
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index ff19082..832413e 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -365,6 +365,27 @@
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
diff --git a/src/version.c b/src/version.c
index 221c757..4ce6fee 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1231,
+/**/
1230,
/**/
1229,