diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-04-22 13:58:46 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-04-22 13:58:46 +0000 |
| commit | 12c22cee34a85421d67390ad0aaaadee35fdc156 (patch) | |
| tree | a51ec42abe1fbe1a076b96d7b3dfbb3969588f38 /src | |
| parent | 9439cdddf7b43997cfed2fb3e4e55b989f6818fb (diff) | |
| download | vim-git-12c22cee34a85421d67390ad0aaaadee35fdc156.tar.gz | |
updated for version 7.2-154v7.2.154
Diffstat (limited to 'src')
| -rw-r--r-- | src/memline.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c index 96261aba0..8c8019ab7 100644 --- a/src/memline.c +++ b/src/memline.c @@ -3771,8 +3771,10 @@ do_swapexists(buf, fname) set_vim_var_string(VV_SWAPCHOICE, NULL, -1); /* Trigger SwapExists autocommands with <afile> set to the file being - * edited. */ + * edited. Disallow changing directory here. */ + ++allbuf_lock; apply_autocmds(EVENT_SWAPEXISTS, buf->b_fname, NULL, FALSE, NULL); + --allbuf_lock; set_vim_var_string(VV_SWAPNAME, NULL, -1); @@ -3798,6 +3800,7 @@ do_swapexists(buf, fname) * * Note: If BASENAMELEN is not correct, you will get error messages for * not being able to open the swapfile + * Note: May trigger SwapExists autocmd, pointers may change! */ static char_u * findswapname(buf, dirp, old_fname) diff --git a/src/version.c b/src/version.c index 438dfccde..7e380eba7 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 */ /**/ + 154, +/**/ 153, /**/ 152, |