From 03a2c5b77200845c30f62250f26e83ff7fbc24b3 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sun, 28 May 2023 15:13:44 +0200 Subject: fix(ftplugin): source Lua files after Vimscript files per directory (#23801) Problem: Lua ftplugins in runtime take precedence over Vimscript ftplugins in user configs (even in `after/`). Solution: Source ftplugins separately per directory, first Vimscript then Lua. --- runtime/ftplugin.vim | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'runtime/ftplugin.vim') diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim index feef949dba..d24c0a036e 100644 --- a/runtime/ftplugin.vim +++ b/runtime/ftplugin.vim @@ -28,9 +28,11 @@ augroup filetypeplugin " When there is a dot it is used to separate filetype names. Thus for " "aaa.bbb" load "aaa" and then "bbb". for name in split(s, '\.') - exe 'runtime! ftplugin/' . name . '.vim ftplugin/' . name . '_*.vim ftplugin/' . name . '/*.vim' - " Load lua ftplugins - exe printf('runtime! ftplugin/%s.lua ftplugin/%s_*.lua ftplugin/%s/*.lua', name, name, name) + " 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) endfor endif endfunc -- cgit 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/ftplugin.vim') 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 From dbb840da01c72d8a311e0c55d3248d78a64b63a4 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 14 Jul 2023 06:46:16 +0800 Subject: fix(runtime): respect 'rtp' order for all runtime files (#24335) --- runtime/ftplugin.vim | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'runtime/ftplugin.vim') diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim index f5c411fbe6..7b55134a4b 100644 --- a/runtime/ftplugin.vim +++ b/runtime/ftplugin.vim @@ -30,10 +30,8 @@ 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 - \ ftplugin/%s_*.vim ftplugin/%s_*.lua - \ ftplugin/%s/*.vim ftplugin/%s/*.lua', - \ name, name, name, name, name, name) + " XXX: "[.]" in the first pattern makes it a wildcard on Windows + exe $'runtime! ftplugin/{name}[.]{{vim,lua}} ftplugin/{name}_*.{{vim,lua}} ftplugin/{name}/*.{{vim,lua}}' endfor endif endfunc -- cgit From cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Sun, 13 Aug 2023 13:25:10 +0100 Subject: vim-patch:e978b4534a5e (#24697) Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749) https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92 Also update the header for the following files that were converted to Vim9 script upstream: - autoload/ccomplete.lua (vim9jitted) - ftplugin.vim - ftplugof.vim - indent.vim - indent/vim.vim - makemenu.vim This also updates the "Last Change" dates, even if some changes (due to rewrites to Vim9 script) were not ported. There's still a few other places where Bram is still mentioned as a maintainer in the files we and Vim have: - ftplugin/bash.vim - indent/bash.vim - indent/html.vim - indent/mail.vim - macros/accents.vim - macros/editexisting.vim - syntax/bash.vim - syntax/shared/typescriptcommon.vim - syntax/tar.vim - syntax/typescript.vim - syntax/typescriptreact.vim - syntax/zimbu.vim Maybe future patches will address that. Also exclude changes to .po files that didn't apply automatically (the `:messages` maintainer string isn't used in Nvim anyway). Co-authored-by: Christian Brabandt --- runtime/ftplugin.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/ftplugin.vim') diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim index 7b55134a4b..2c56241398 100644 --- a/runtime/ftplugin.vim +++ b/runtime/ftplugin.vim @@ -1,7 +1,8 @@ " Vim support file to switch on loading plugins for file types " -" Maintainer: Bram Moolenaar -" Last change: 2006 Apr 30 +" Maintainer: The Vim Project +" Last change: 2023 Aug 10 +" Former Maintainer: Bram Moolenaar if exists("did_load_ftplugin") finish -- cgit