0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.2-272

This commit is contained in:
Bram Moolenaar 2009-11-03 12:06:23 +00:00
parent 0af561dbf2
commit d0ba34a6e5
2 changed files with 12 additions and 7 deletions

View File

@ -864,8 +864,9 @@ ml_recover()
recoverymode = TRUE; recoverymode = TRUE;
called_from_main = (curbuf->b_ml.ml_mfp == NULL); called_from_main = (curbuf->b_ml.ml_mfp == NULL);
attr = hl_attr(HLF_E); attr = hl_attr(HLF_E);
/*
* If the file name ends in ".sw?" we use it directly. /*
* If the file name ends in ".s[uvw][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;
@ -874,11 +875,13 @@ ml_recover()
len = (int)STRLEN(fname); len = (int)STRLEN(fname);
if (len >= 4 && if (len >= 4 &&
#if defined(VMS) || defined(RISCOS) #if defined(VMS) || defined(RISCOS)
STRNICMP(fname + len - 4, "_sw" , 3) STRNICMP(fname + len - 4, "_s" , 2)
#else #else
STRNICMP(fname + len - 4, ".sw" , 3) STRNICMP(fname + len - 4, ".s" , 2)
#endif #endif
== 0) == 0
&& vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
&& ASCII_ISALPHA(fname[len - 1]))
{ {
directly = TRUE; directly = TRUE;
fname = vim_strsave(fname); /* make a copy for mf_open() */ fname = vim_strsave(fname); /* make a copy for mf_open() */

View File

@ -676,6 +676,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 */
/**/
272,
/**/ /**/
271, 271,
/**/ /**/