mirror of
https://github.com/vim/vim.git
synced 2025-09-28 04:24:06 -04:00
patch 8.0.1363: recovering does not work when swap file ends in .stz
Problem: Recovering does not work when swap file ends in .stz. Solution: Check for all possible swap file names. (Elfling, closes #2395, closes #2396)
This commit is contained in:
@@ -1139,7 +1139,7 @@ ml_recover(void)
|
|||||||
attr = HL_ATTR(HLF_E);
|
attr = HL_ATTR(HLF_E);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
|
* If the file name ends in ".s[a-w][a-z]" we assume this is the swap file.
|
||||||
* Otherwise a search is done to find the swap file(s).
|
* Otherwise a search is done to find the swap file(s).
|
||||||
*/
|
*/
|
||||||
fname = curbuf->b_fname;
|
fname = curbuf->b_fname;
|
||||||
@@ -1153,7 +1153,8 @@ ml_recover(void)
|
|||||||
STRNICMP(fname + len - 4, ".s", 2)
|
STRNICMP(fname + len - 4, ".s", 2)
|
||||||
#endif
|
#endif
|
||||||
== 0
|
== 0
|
||||||
&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
|
&& vim_strchr((char_u *)"abcdefghijklmnopqrstuvw",
|
||||||
|
TOLOWER_ASC(fname[len - 2])) != NULL
|
||||||
&& ASCII_ISALPHA(fname[len - 1]))
|
&& ASCII_ISALPHA(fname[len - 1]))
|
||||||
{
|
{
|
||||||
directly = TRUE;
|
directly = TRUE;
|
||||||
|
@@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1363,
|
||||||
/**/
|
/**/
|
||||||
1362,
|
1362,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user