aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.0211: expanding a file name "~" results in $HOME

Browse Source 
Problem:    Expanding a file name "~" results in $HOME. (Aidan Shafran)
Solution:   Change "~" to "./~" before expanding. (closes #3072)
This commit is contained in:
Bram Moolenaar
2018-07-25 21:19:13 +02:00
parent 6f8d2ac6f1
commit 00136dc321
8 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ex_docmd.c
View File

@@ -10654,6 +10654,7 @@ eval_vars(
int resultlen;
buf_T *buf;
int valid = VALID_HEAD + VALID_PATH; /* assume valid result */
int tilde_file = FALSE;
int spec_idx;
#ifdef FEAT_MODIFY_FNAME
int skip_mod = FALSE;
@@ -10720,7 +10721,10 @@ eval_vars(
valid = 0; /* Must have ":p:h" to be valid */
}
else
{
result = curbuf->b_fname;
tilde_file = STRCMP(result, "~") == 0;
}
break;
case SPEC_HASH: /* '#' or "#99": alternate file */
@@ -10784,7 +10788,10 @@ eval_vars(
valid = 0; /* Must have ":p:h" to be valid */
}
else
{
result = buf->b_fname;
tilde_file = STRCMP(result, "~") == 0;
}
}
break;
@@ -10877,7 +10884,7 @@ eval_vars(
#ifdef FEAT_MODIFY_FNAME
else if (!skip_mod)
{
valid |= modify_fname(src, usedlen, &result, &resultbuf,
valid |= modify_fname(src, tilde_file, usedlen, &result, &resultbuf,
&resultlen);
if (result == NULL)
{