From 502a7a0558b0f8f81edcc3eb081587fd180d14f0 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sun, 25 Jun 2023 12:34:30 +0200 Subject: fix(ftplugin): respect runtimepath ordering Problem: bundled `ftplugin/foo/*.vim` are sourced before user `ftplugin/foo.vim`. Solution: call `runtime!` once on all patterns to be sourced. Followup to #23801. Fixes #24003. --- runtime/ftplugin.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'runtime') diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim index d24c0a036e..f5c411fbe6 100644 --- a/runtime/ftplugin.vim +++ b/runtime/ftplugin.vim @@ -30,9 +30,10 @@ augroup filetypeplugin for name in split(s, '\.') " Load Lua ftplugins after Vim ftplugins _per directory_ " TODO(clason): use nvim__get_runtime when supports globs and modeline - exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua', name, name) - exe printf('runtime! ftplugin/%s_*.vim ftplugin/%s_*.lua', name, name) - exe printf('runtime! ftplugin/%s/*.vim ftplugin/%s/*.lua', name, name) + exe printf('runtime! ftplugin/%s.vim ftplugin/%s.lua + \ ftplugin/%s_*.vim ftplugin/%s_*.lua + \ ftplugin/%s/*.vim ftplugin/%s/*.lua', + \ name, name, name, name, name, name) endfor endif endfunc -- cgit