projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ef0610d1 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.202 | |
| 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.202 | |
| 11 | Problem: BufWipeout autocommand that edits another buffer causes problems. | |
| 12 | Solution: Check for the situation, give an error and quit the operation. | |
| 13 | Files: src/fileio.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.201/src/fileio.c 2009-05-16 17:29:37.000000000 +0200 | |
| 17 | --- src/fileio.c 2009-06-11 21:22:37.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 4824,4829 **** | |
| 20 | --- 4824,4831 ---- | |
| 21 | char_u *sfname; | |
| 22 | { | |
| 23 | #ifdef FEAT_AUTOCMD | |
| 24 | + buf_T *buf = curbuf; | |
| 25 | + | |
| 26 | /* It's like the unnamed buffer is deleted.... */ | |
| 27 | if (curbuf->b_p_bl) | |
| 28 | apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf); | |
| 29 | *************** | |
| 30 | *** 4832,4837 **** | |
| 31 | --- 4834,4845 ---- | |
| 32 | if (aborting()) /* autocmds may abort script processing */ | |
| 33 | return FAIL; | |
| 34 | # endif | |
| 35 | + if (curbuf != buf) | |
| 36 | + { | |
| 37 | + /* We are in another buffer now, don't do the renaming. */ | |
| 38 | + EMSG(_(e_auchangedbuf)); | |
| 39 | + return FAIL; | |
| 40 | + } | |
| 41 | #endif | |
| 42 | ||
| 43 | if (setfname(curbuf, fname, sfname, FALSE) == OK) | |
| 44 | *** ../vim-7.2.201/src/version.c 2009-06-16 15:23:07.000000000 +0200 | |
| 45 | --- src/version.c 2009-06-16 15:28:31.000000000 +0200 | |
| 46 | *************** | |
| 47 | *** 678,679 **** | |
| 48 | --- 678,681 ---- | |
| 49 | { /* Add new patch number below this line */ | |
| 50 | + /**/ | |
| 51 | + 202, | |
| 52 | /**/ | |
| 53 | ||
| 54 | -- | |
| 55 | How To Keep A Healthy Level Of Insanity: | |
| 56 | 14. Put mosquito netting around your work area. Play a tape of jungle | |
| 57 | sounds all day. | |
| 58 | ||
| 59 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 60 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 61 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 62 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |