diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-23 21:35:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-23 21:35:48 +0200 |
| commit | 99499b1c05f85f83876b828eea3f6e14f0f407b4 (patch) | |
| tree | 88da7aeb6c66daf0c6555388952334efa8cb642e /src/ex_cmds.c | |
| parent | 05b8b07e2770b66ab77fdb5e195cae809959bdab (diff) | |
| download | vim-git-99499b1c05f85f83876b828eea3f6e14f0f407b4.tar.gz | |
patch 8.1.1371: cannot recover from a swap filev8.1.1371
Problem: Cannot recover from a swap file.
Solution: Do not expand environment variables in the swap file name.
Do not check the extension when we already know a file is a swap
file. (Ken Takata, closes 4415, closes #4369)
Diffstat (limited to 'src/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 0174fd6b0..040514cdc 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -7002,7 +7002,8 @@ fix_help_buffer(void) copy_option_part(&p, NameBuff, MAXPATHL, ","); mustfree = FALSE; rt = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); - if (rt != NULL && fullpathcmp(rt, NameBuff, FALSE) != FPC_SAME) + if (rt != NULL && + fullpathcmp(rt, NameBuff, FALSE, TRUE) != FPC_SAME) { int fcount; char_u **fnames; @@ -7224,7 +7225,7 @@ helptags_one( */ ga_init2(&ga, (int)sizeof(char_u *), 100); if (add_help_tags || fullpathcmp((char_u *)"$VIMRUNTIME/doc", - dir, FALSE) == FPC_SAME) + dir, FALSE, TRUE) == FPC_SAME) { if (ga_grow(&ga, 1) == FAIL) got_int = TRUE; |