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_cmds2.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_cmds2.c')
| -rw-r--r-- | src/ex_cmds2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index bf6e55120..59452032b 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1715,7 +1715,7 @@ editing_arg_idx(win_T *win) && (win->w_buffer->b_ffname == NULL || !(fullpathcmp( alist_name(&WARGLIST(win)[win->w_arg_idx]), - win->w_buffer->b_ffname, TRUE) & FPC_SAME)))); + win->w_buffer->b_ffname, TRUE, TRUE) & FPC_SAME)))); } /* @@ -1737,7 +1737,7 @@ check_arg_idx(win_T *win) && (win->w_buffer->b_fnum == GARGLIST[GARGCOUNT - 1].ae_fnum || (win->w_buffer->b_ffname != NULL && (fullpathcmp(alist_name(&GARGLIST[GARGCOUNT - 1]), - win->w_buffer->b_ffname, TRUE) & FPC_SAME)))) + win->w_buffer->b_ffname, TRUE, TRUE) & FPC_SAME)))) arg_had_last = TRUE; } else |