|
 |
c4740ed |
To: vim-dev@vim.org
|
|
|
c4740ed |
Subject: Patch 7.2.272
|
|
|
c4740ed |
Fcc: outbox
|
|
|
c4740ed |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
c4740ed |
Mime-Version: 1.0
|
|
|
c4740ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c4740ed |
Content-Transfer-Encoding: 8bit
|
|
|
c4740ed |
------------
|
|
|
c4740ed |
|
|
|
c4740ed |
Patch 7.2.272
|
|
|
c4740ed |
Problem: "_.svz" is not recognized as a swap file. (David M. Besonen)
|
|
|
c4740ed |
Solution: Accept .s[uvw][a-z] as a swap file name extension.
|
|
|
c4740ed |
Files: src/memline.c
|
|
|
c4740ed |
|
|
|
c4740ed |
|
|
|
c4740ed |
*** ../vim-7.2.271/src/memline.c 2009-04-22 15:56:27.000000000 +0200
|
|
|
c4740ed |
--- src/memline.c 2009-10-29 20:55:08.000000000 +0100
|
|
|
c4740ed |
***************
|
|
|
c4740ed |
*** 864,884 ****
|
|
|
c4740ed |
recoverymode = TRUE;
|
|
|
c4740ed |
called_from_main = (curbuf->b_ml.ml_mfp == NULL);
|
|
|
c4740ed |
attr = hl_attr(HLF_E);
|
|
|
c4740ed |
! /*
|
|
|
c4740ed |
! * If the file name ends in ".sw?" we use it directly.
|
|
|
c4740ed |
! * Otherwise a search is done to find the swap file(s).
|
|
|
c4740ed |
! */
|
|
|
c4740ed |
fname = curbuf->b_fname;
|
|
|
c4740ed |
if (fname == NULL) /* When there is no file name */
|
|
|
c4740ed |
fname = (char_u *)"";
|
|
|
c4740ed |
len = (int)STRLEN(fname);
|
|
|
c4740ed |
if (len >= 4 &&
|
|
|
c4740ed |
#if defined(VMS) || defined(RISCOS)
|
|
|
c4740ed |
! STRNICMP(fname + len - 4, "_sw" , 3)
|
|
|
c4740ed |
#else
|
|
|
c4740ed |
! STRNICMP(fname + len - 4, ".sw" , 3)
|
|
|
c4740ed |
#endif
|
|
|
c4740ed |
! == 0)
|
|
|
c4740ed |
{
|
|
|
c4740ed |
directly = TRUE;
|
|
|
c4740ed |
fname = vim_strsave(fname); /* make a copy for mf_open() */
|
|
|
c4740ed |
--- 864,887 ----
|
|
|
c4740ed |
recoverymode = TRUE;
|
|
|
c4740ed |
called_from_main = (curbuf->b_ml.ml_mfp == NULL);
|
|
|
c4740ed |
attr = hl_attr(HLF_E);
|
|
|
c4740ed |
!
|
|
|
c4740ed |
! /*
|
|
|
c4740ed |
! * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file.
|
|
|
c4740ed |
! * Otherwise a search is done to find the swap file(s).
|
|
|
c4740ed |
! */
|
|
|
c4740ed |
fname = curbuf->b_fname;
|
|
|
c4740ed |
if (fname == NULL) /* When there is no file name */
|
|
|
c4740ed |
fname = (char_u *)"";
|
|
|
c4740ed |
len = (int)STRLEN(fname);
|
|
|
c4740ed |
if (len >= 4 &&
|
|
|
c4740ed |
#if defined(VMS) || defined(RISCOS)
|
|
|
c4740ed |
! STRNICMP(fname + len - 4, "_s" , 2)
|
|
|
c4740ed |
#else
|
|
|
c4740ed |
! STRNICMP(fname + len - 4, ".s" , 2)
|
|
|
c4740ed |
#endif
|
|
|
c4740ed |
! == 0
|
|
|
c4740ed |
! && vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL
|
|
|
c4740ed |
! && ASCII_ISALPHA(fname[len - 1]))
|
|
|
c4740ed |
{
|
|
|
c4740ed |
directly = TRUE;
|
|
|
c4740ed |
fname = vim_strsave(fname); /* make a copy for mf_open() */
|
|
|
c4740ed |
*** ../vim-7.2.271/src/version.c 2009-11-03 12:53:44.000000000 +0100
|
|
|
c4740ed |
--- src/version.c 2009-11-03 13:02:51.000000000 +0100
|
|
|
c4740ed |
***************
|
|
|
c4740ed |
*** 678,679 ****
|
|
|
c4740ed |
--- 678,681 ----
|
|
|
c4740ed |
{ /* Add new patch number below this line */
|
|
|
c4740ed |
+ /**/
|
|
|
c4740ed |
+ 272,
|
|
|
c4740ed |
/**/
|
|
|
c4740ed |
|
|
|
c4740ed |
--
|
|
|
c4740ed |
Sorry, no fortune today.
|
|
|
c4740ed |
|
|
|
c4740ed |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
c4740ed |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
c4740ed |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
c4740ed |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|