1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/api/options.c b/src/nvim/api/options.c
index 31a2fb3b80..baeb3e88fb 100644
--- a/src/nvim/api/options.c
+++ b/src/nvim/api/options.c
@@ -111,15 +111,15 @@ static buf_T *do_ft_buf(char *filetype, aco_save_T *aco, Error *err)
 
   // Set curwin/curbuf to buf and save a few things.
   aucmd_prepbuf(aco, ftbuf);
-  set_option_value("bufhidden", 0L, "hide", OPT_LOCAL);
-  set_option_value("buftype", 0L, "nofile", OPT_LOCAL);
-  set_option_value("swapfile", 0L, NULL, OPT_LOCAL);
-  set_option_value("modeline", 0L, NULL, OPT_LOCAL);  // 'nomodeline'
-
-  ftbuf->b_p_ft = xstrdup(filetype);
 
   TRY_WRAP(err, {
-    apply_autocmds(EVENT_FILETYPE, ftbuf->b_p_ft, ftbuf->b_fname, true, ftbuf);
+    set_option_value("bufhidden", 0L, "hide", OPT_LOCAL);
+    set_option_value("buftype", 0L, "nofile", OPT_LOCAL);
+    set_option_value("swapfile", 0L, NULL, OPT_LOCAL);
+    set_option_value("modeline", 0L, NULL, OPT_LOCAL);  // 'nomodeline'
+
+    ftbuf->b_p_ft = xstrdup(filetype);
+    do_filetype_autocmd(ftbuf, false);
   });
 
   return ftbuf;