updated for version 7.2-154

diff --git a/src/memline.c b/src/memline.c
index 96261aba0e66ed0ec16c5ef2be183a5e92561e90..8c8019ab7be04965e156d3985d4b885bed53b881 100644 (file)
--- 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 438dfccde0d5b298f57eae9ca6b114c94af551b1..7e380eba75649d888652be0260139a49a16e3327 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    154,
 /**/
     153,
 /**/