aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2017-01-11 14:16:43 +0100
committerMarco Hinz <mh.codebro@gmail.com>2017-01-13 15:29:04 +0100
commit30f775f8a6061697c3a3619f26c21d237ad92027 (patch)
tree5d23f5722da6f26ec5755a8f3e64e677096a3b60 /src
parentbd8025727cc1ca4389af8fc690b467e2e25a3903 (diff)
downloadrneovim-30f775f8a6061697c3a3619f26c21d237ad92027.tar.gz
rneovim-30f775f8a6061697c3a3619f26c21d237ad92027.tar.bz2
rneovim-30f775f8a6061697c3a3619f26c21d237ad92027.zip
Don't expand filenames during autocmd
Diffstat (limited to 'src')
-rw-r--r--src/nvim/fileio.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 6f95ced147..3f5152aea3 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -6716,8 +6716,9 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
fname = vim_strsave(fname); /* make a copy, so we can change it */
} else {
sfname = vim_strsave(fname);
- // don't try expanding the following events
+ // Don't try expanding the following events.
if (event == EVENT_COLORSCHEME
+ || event == EVENT_DIRCHANGED
|| event == EVENT_FILETYPE
|| event == EVENT_FUNCUNDEFINED
|| event == EVENT_OPTIONSET
@@ -6726,10 +6727,11 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
|| event == EVENT_REMOTEREPLY
|| event == EVENT_SPELLFILEMISSING
|| event == EVENT_SYNTAX
- || event == EVENT_TABCLOSED)
+ || event == EVENT_TABCLOSED) {
fname = vim_strsave(fname);
- else
- fname = (char_u *)FullName_save((char *)fname, FALSE);
+ } else {
+ fname = (char_u *)FullName_save((char *)fname, false);
+ }
}
if (fname == NULL) { /* out of memory */
xfree(sfname);