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/buffer.c | |
| parent | 05b8b07e2770b66ab77fdb5e195cae809959bdab (diff) | |
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/buffer.c')
| -rw-r--r-- | src/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index e10368483d..0e45f0e66c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1071,7 +1071,7 @@ handle_swap_exists(bufref_T *old_curbuf) /* User selected Recover at ATTENTION prompt. */ msg_scroll = TRUE; - ml_recover(); + ml_recover(FALSE); msg_puts("\n"); /* don't overwrite the last message */ cmdline_row = msg_row; do_modelines(0); @@ -4943,7 +4943,7 @@ do_arg_all( if (i < alist->al_ga.ga_len && (AARGLIST(alist)[i].ae_fnum == buf->b_fnum || fullpathcmp(alist_name(&AARGLIST(alist)[i]), - buf->b_ffname, TRUE) & FPC_SAME)) + buf->b_ffname, TRUE, TRUE) & FPC_SAME)) { int weight = 1; |