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 <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ca4678cce5a5ea4e8e55952f1207e45c2d50b2fb..9e842cc960b633f6fa7412a9838b8c66e85a5c81 100644 (file)
--- 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 a8c7ef4adb8e4cc47f5a57c86f614f5d9f569057..19846d97cf314df37c5f2fc0ae2fc198dcd9df9b 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -396,7 +396,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     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 7eb84b74305a0d0a77deb89fa194370fb3f9c8c6..5278867360ed2f2470a7a568434afb70c26f5722 100644 (file)
--- 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,
 /**/