projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| d02ad552 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.175 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.175 | |
| 11 | Problem: Changing 'backupext' in a *WritePre autocommand doesn't work. | |
| 12 | (William Natter) | |
| 13 | Solution: Move the use of p_bex to after executing the *WritePre | |
| 14 | autocommands. Also avoids reading allocated memory after freeing. | |
| 15 | Files: src/fileio.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.174/src/fileio.c Wed Nov 12 20:41:45 2003 | |
| 19 | --- src/fileio.c Thu Jan 8 20:22:41 2004 | |
| 20 | *************** | |
| 21 | *** 2502,2517 **** | |
| 22 | fname = sfname; | |
| 23 | #endif | |
| 24 | ||
| 25 | - /* make sure we have a valid backup extension to use */ | |
| 26 | - if (*p_bex == NUL) | |
| 27 | - #ifdef RISCOS | |
| 28 | - backup_ext = (char_u *)"/bak"; | |
| 29 | - #else | |
| 30 | - backup_ext = (char_u *)".bak"; | |
| 31 | - #endif | |
| 32 | - else | |
| 33 | - backup_ext = p_bex; | |
| 34 | - | |
| 35 | if (buf->b_ffname != NULL && fnamecmp(ffname, buf->b_ffname) == 0) | |
| 36 | overwriting = TRUE; | |
| 37 | else | |
| 38 | --- 2502,2507 ---- | |
| 39 | *************** | |
| 40 | *** 2896,2901 **** | |
| 41 | --- 2886,2903 ---- | |
| 42 | } | |
| 43 | #endif | |
| 44 | ||
| 45 | + /* make sure we have a valid backup extension to use */ | |
| 46 | + if (*p_bex == NUL) | |
| 47 | + { | |
| 48 | + #ifdef RISCOS | |
| 49 | + backup_ext = (char_u *)"/bak"; | |
| 50 | + #else | |
| 51 | + backup_ext = (char_u *)".bak"; | |
| 52 | + #endif | |
| 53 | + } | |
| 54 | + else | |
| 55 | + backup_ext = p_bex; | |
| 56 | + | |
| 57 | if (backup_copy | |
| 58 | && (fd = mch_open((char *)fname, O_RDONLY | O_EXTRA, 0)) >= 0) | |
| 59 | { | |
| 60 | *** ../vim-6.2.174/src/version.c Thu Jan 8 20:54:45 2004 | |
| 61 | --- src/version.c Fri Jan 9 14:32:03 2004 | |
| 62 | *************** | |
| 63 | *** 639,640 **** | |
| 64 | --- 639,642 ---- | |
| 65 | { /* Add new patch number below this line */ | |
| 66 | + /**/ | |
| 67 | + 175, | |
| 68 | /**/ | |
| 69 | ||
| 70 | -- | |
| 71 | hundred-and-one symptoms of being an internet addict: | |
| 72 | 203. You're an active member of more than 20 newsgroups. | |
| 73 | ||
| 74 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 75 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 76 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 77 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |