updated for version 7.1-186
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index d44fcb4..c6a4baf 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7799,6 +7799,7 @@
free_cd_dir()
{
vim_free(prev_dir);
+ prev_dir = NULL;
}
#endif
@@ -9521,6 +9522,7 @@
*errormsg = (char_u *)_("E495: no autocommand file name to substitute for \"<afile>\"");
return NULL;
}
+ result = shorten_fname1(result);
break;
case SPEC_ABUF: /* buffer number for autocommand */
diff --git a/src/fileio.c b/src/fileio.c
index f6a4da7..bcf3552 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5556,7 +5556,7 @@
#endif
#if defined(FEAT_VIMINFO) || defined(FEAT_BROWSE) || \
- defined(FEAT_QUICKFIX) || defined(PROTO)
+ defined(FEAT_QUICKFIX) || defined(FEAT_AUTOCMD) || defined(PROTO)
/*
* Try to find a shortname by comparing the fullname with the current
* directory.
@@ -8546,6 +8546,8 @@
/*
* Set the file name to be used for <afile>.
+ * Make a copy to avoid that changing a buffer name or directory makes it
+ * invalid.
*/
if (fname_io == NULL)
{
@@ -8558,6 +8560,8 @@
}
else
autocmd_fname = fname_io;
+ if (autocmd_fname != NULL)
+ autocmd_fname = FullName_save(autocmd_fname, FALSE);
/*
* Set the buffer number to be used for <abuf>.
@@ -8740,6 +8744,7 @@
vim_free(sourcing_name);
sourcing_name = save_sourcing_name;
sourcing_lnum = save_sourcing_lnum;
+ vim_free(autocmd_fname);
autocmd_fname = save_autocmd_fname;
autocmd_bufnr = save_autocmd_bufnr;
autocmd_match = save_autocmd_match;
diff --git a/src/version.c b/src/version.c
index cb26627..587e05d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 186,
+/**/
185,
/**/
184,
