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)
diff --git a/src/buffer.c b/src/buffer.c
index e103684..0e45f0e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1071,7 +1071,7 @@
/* 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 @@
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;