diff options
author | Bram Moolenaar <Bram@vim.org> | 2009-06-16 13:35:20 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2009-06-16 13:35:20 +0000 |
commit | 8b38e2416c1c56e38fa85ad048a4e1a3df851a43 (patch) | |
tree | 20d7cea7e0dfe35f3d7358b98d1d827175d1a7a7 | |
parent | 3a6eaa58d56f6982c6e3bccfdf712d6da78a1195 (diff) |
updated for version 7.2-202v7.2.202
-rw-r--r-- | src/fileio.c | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c index d190863170..ad7670d2ff 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4824,6 +4824,8 @@ set_rw_fname(fname, sfname) char_u *sfname; { #ifdef FEAT_AUTOCMD + buf_T *buf = curbuf; + /* It's like the unnamed buffer is deleted.... */ if (curbuf->b_p_bl) apply_autocmds(EVENT_BUFDELETE, NULL, NULL, FALSE, curbuf); @@ -4832,6 +4834,12 @@ set_rw_fname(fname, sfname) if (aborting()) /* autocmds may abort script processing */ return FAIL; # endif + if (curbuf != buf) + { + /* We are in another buffer now, don't do the renaming. */ + EMSG(_(e_auchangedbuf)); + return FAIL; + } #endif if (setfname(curbuf, fname, sfname, FALSE) == OK) diff --git a/src/version.c b/src/version.c index 72208d1b5a..496212eb02 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 202, +/**/ 201, /**/ 200, |