summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ca4678cce5..9e842cc960 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 a8c7ef4adb..19846d97cf 100644
--- 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 7eb84b7430..5278867360 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 249,
+/**/
248,
/**/
247,