thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1371: cannot recover from a swap file

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2019-05-23 21:35:48 +02:00
parent 05b8b07e27
commit 99499b1c05
18 changed files with 168 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ex_cmds2.c
View File

@@ -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