diff options
| -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 96261aba..8c8019ab 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 438dfccd..7e380eba 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, |