Mercurial > vim
diff src/buffer.c @ 16738:b52ea9c5f1db v8.1.1371
patch 8.1.1371: cannot recover from a swap file
commit https://github.com/vim/vim/commit/99499b1c05f85f83876b828eea3f6e14f0f407b4
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 23 21:35:48 2019 +0200
patch 8.1.1371: cannot recover from a swap file
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 23 May 2019 21:45:07 +0200 |
| parents | ca1814eeecf5 |
| children | dc85d49349f7 |
line wrap: on
line diff
--- 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;