From a917bd58bde0e1fca2affedc6fc0c15cb6b5e9f2 Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Sun, 31 Mar 2024 19:54:12 +0200 Subject: [PATCH] patch 9.1.0249: filetype: rock_manifest and config.ld files are not recognized Problem: filetype: rock_manifest and config.ld files are not recognized Solution: Detect 'rock_manifest' and 'config.ld' as lua (Wu, Zhenyu) closes: #14370 Signed-off-by: Wu, Zhenyu Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 5 ++++- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ca4678cce..9e842cc96 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1269,7 +1269,10 @@ au BufNewFile,BufRead .luaurc setf jsonc au BufNewFile,BufRead .luacheckrc setf lua " Luarocks -au BufNewFile,BufRead *.rockspec setf lua +au BufNewFile,BufRead *.rockspec,rock_manifest setf lua + +" Luadoc, Ldoc +au BufNewFile,BufRead config.ld setf lua " Linden Scripting Language (Second Life) au BufNewFile,BufRead *.lsl call dist#ft#FTlsl() diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index a8c7ef4ad..19846d97c 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -396,7 +396,7 @@ def s:GetFilenameChecks(): dict> lpc: ['file.lpc', 'file.ulpc'], lsl: ['file.lsl'], lss: ['file.lss'], - lua: ['file.lua', 'file.tlu', 'file.rockspec', 'file.nse', '.luacheckrc', '.busted'], + lua: ['file.lua', 'file.tlu', 'file.rockspec', 'file.nse', '.luacheckrc', '.busted', 'rock_manifest', 'config.ld'], luau: ['file.luau'], lynx: ['lynx.cfg'], lyrics: ['file.lrc'], diff --git a/src/version.c b/src/version.c index 7eb84b743..527886736 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 249, /**/ 248, /**/