projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c936e692 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.272 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.272 | |
| 11 | Problem: "_.svz" is not recognized as a swap file. (David M. Besonen) | |
| 12 | Solution: Accept .s[uvw][a-z] as a swap file name extension. | |
| 13 | Files: src/memline.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.271/src/memline.c 2009-04-22 15:56:27.000000000 +0200 | |
| 17 | --- src/memline.c 2009-10-29 20:55:08.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 864,884 **** | |
| 20 | recoverymode = TRUE; | |
| 21 | called_from_main = (curbuf->b_ml.ml_mfp == NULL); | |
| 22 | attr = hl_attr(HLF_E); | |
| 23 | ! /* | |
| 24 | ! * If the file name ends in ".sw?" we use it directly. | |
| 25 | ! * Otherwise a search is done to find the swap file(s). | |
| 26 | ! */ | |
| 27 | fname = curbuf->b_fname; | |
| 28 | if (fname == NULL) /* When there is no file name */ | |
| 29 | fname = (char_u *)""; | |
| 30 | len = (int)STRLEN(fname); | |
| 31 | if (len >= 4 && | |
| 32 | #if defined(VMS) || defined(RISCOS) | |
| 33 | ! STRNICMP(fname + len - 4, "_sw" , 3) | |
| 34 | #else | |
| 35 | ! STRNICMP(fname + len - 4, ".sw" , 3) | |
| 36 | #endif | |
| 37 | ! == 0) | |
| 38 | { | |
| 39 | directly = TRUE; | |
| 40 | fname = vim_strsave(fname); /* make a copy for mf_open() */ | |
| 41 | --- 864,887 ---- | |
| 42 | recoverymode = TRUE; | |
| 43 | called_from_main = (curbuf->b_ml.ml_mfp == NULL); | |
| 44 | attr = hl_attr(HLF_E); | |
| 45 | ! | |
| 46 | ! /* | |
| 47 | ! * If the file name ends in ".s[uvw][a-z]" we assume this is the swap file. | |
| 48 | ! * Otherwise a search is done to find the swap file(s). | |
| 49 | ! */ | |
| 50 | fname = curbuf->b_fname; | |
| 51 | if (fname == NULL) /* When there is no file name */ | |
| 52 | fname = (char_u *)""; | |
| 53 | len = (int)STRLEN(fname); | |
| 54 | if (len >= 4 && | |
| 55 | #if defined(VMS) || defined(RISCOS) | |
| 56 | ! STRNICMP(fname + len - 4, "_s" , 2) | |
| 57 | #else | |
| 58 | ! STRNICMP(fname + len - 4, ".s" , 2) | |
| 59 | #endif | |
| 60 | ! == 0 | |
| 61 | ! && vim_strchr((char_u *)"UVWuvw", fname[len - 2]) != NULL | |
| 62 | ! && ASCII_ISALPHA(fname[len - 1])) | |
| 63 | { | |
| 64 | directly = TRUE; | |
| 65 | fname = vim_strsave(fname); /* make a copy for mf_open() */ | |
| 66 | *** ../vim-7.2.271/src/version.c 2009-11-03 12:53:44.000000000 +0100 | |
| 67 | --- src/version.c 2009-11-03 13:02:51.000000000 +0100 | |
| 68 | *************** | |
| 69 | *** 678,679 **** | |
| 70 | --- 678,681 ---- | |
| 71 | { /* Add new patch number below this line */ | |
| 72 | + /**/ | |
| 73 | + 272, | |
| 74 | /**/ | |
| 75 | ||
| 76 | -- | |
| 77 | Sorry, no fortune today. | |
| 78 | ||
| 79 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 80 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 81 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 82 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |