patch 9.0.0362: expanding ":e %" does not work for remote files
Problem: Expanding ":e %" does not work for remote files.
Solution: If the "%" or "#" file does not exist add the expansion anyway.
diff --git a/src/filepath.c b/src/filepath.c
index c61d711..b824529 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -3088,17 +3088,22 @@
int ret = FAIL;
char_u *eval_pat = NULL;
char_u *exp_pat = *pat;
- char *ignored_msg;
+ char *ignored_msg;
int usedlen;
+ int is_cur_alt_file = *exp_pat == '%' || *exp_pat == '#';
+ int star_follows = FALSE;
- if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<')
+ if (is_cur_alt_file || *exp_pat == '<')
{
++emsg_off;
eval_pat = eval_vars(exp_pat, exp_pat, &usedlen,
NULL, &ignored_msg, NULL, TRUE);
--emsg_off;
if (eval_pat != NULL)
+ {
+ star_follows = STRCMP(exp_pat + usedlen, "*") == 0;
exp_pat = concat_str(eval_pat, exp_pat + usedlen);
+ }
}
if (exp_pat != NULL)
@@ -3106,6 +3111,20 @@
if (eval_pat != NULL)
{
+ if (*num_file == 0 && is_cur_alt_file && star_follows)
+ {
+ // Expanding "%" or "#" and the file does not exist: Add the
+ // pattern anyway (without the star) so that this works for remote
+ // files and non-file buffer names.
+ *file = ALLOC_ONE(char_u *);
+ if (*file != NULL)
+ {
+ **file = eval_pat;
+ eval_pat = NULL;
+ *num_file = 1;
+ ret = OK;
+ }
+ }
vim_free(exp_pat);
vim_free(eval_pat);
}
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 335e756..80e82ea 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -1306,6 +1306,18 @@
bw!
endfunc
+func Test_cmdline_expand_cur_alt_file()
+ enew
+ file http://some.com/file.txt
+ call feedkeys(":e %\<Tab>\<C-B>\"\<CR>", 'xt')
+ call assert_equal('"e http://some.com/file.txt', @:)
+ edit another
+ call feedkeys(":e #\<Tab>\<C-B>\"\<CR>", 'xt')
+ call assert_equal('"e http://some.com/file.txt', @:)
+ bwipe
+ bwipe http://some.com/file.txt
+endfunc
+
" using a leading backslash here
set cpo+=C
diff --git a/src/version.c b/src/version.c
index c6d3869..7607e57 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 362,
+/**/
361,
/**/
360,