aboutsummaryrefslogtreecommitdiff
path: root/runtime/scripts.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/scripts.vim')
-rw-r--r--runtime/scripts.vim6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 36763a4a82..49e9e259a2 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -11,9 +11,9 @@
" 'ignorecase' option making a difference. Where case is to be ignored use
" =~? instead. Do not use =~ anywhere.
-
-" Only do the rest when the FileType autocommand has not been triggered yet.
-if did_filetype()
+" Only do the rest when not using Lua filetype detection
+" and the FileType autocommand has not been triggered yet.
+if exists("g:do_filetype_lua") && g:do_filetype_lua || did_filetype()
finish
endif