From 5c53e29ca9f5e86dd905cae134c78aa341ead157 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 23 Apr 2022 17:57:38 +0200 Subject: fix(ftdetect): source plugins in autogroup (#18237) In `filetype.lua`, source runtime `ftdetect` scripts within the `filetypedetect` augroup, same as `filetype.vim` (and only do so if `g:did_load_ftdetect` does not exist). --- runtime/filetype.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'runtime') diff --git a/runtime/filetype.lua b/runtime/filetype.lua index 8224b79534..47d55d8465 100644 --- a/runtime/filetype.lua +++ b/runtime/filetype.lua @@ -17,10 +17,14 @@ vim.api.nvim_create_autocmd({"BufRead", "BufNewFile"}, { }) -- These *must* be sourced after the autocommand above is created -vim.cmd [[ -runtime! ftdetect/*.vim -runtime! ftdetect/*.lua -]] +if not vim.g.did_load_ftdetect then + vim.cmd [[ + augroup filetypedetect + runtime! ftdetect/*.vim + runtime! ftdetect/*.lua + augroup END + ]] +end -- Set a marker so that the ftdetect scripts are not sourced a second time by filetype.vim vim.g.did_load_ftdetect = 1 -- cgit