patch 9.0.0604: luacheckrc file is not recognized

Problem:    Luacheckrc file is not recognized.
Solution:   Use lua filetype for luacheckrc. (closes #11236)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 725bb6d28274dad516a3fa3fd9f20d70937cf612..519ea330f75aca9e389aac2fb896f7796b37482a 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1112,6 +1112,9 @@ au BufNewFile,BufRead *.lou,*.lout                setf lout
 " Lua
 au BufNewFile,BufRead *.lua                    setf lua
 
+" Luacheck
+au BufNewFile,BufRead .luacheckrc              setf lua
+
 " Luarocks
 au BufNewFile,BufRead *.rockspec               setf lua
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1082eebff5bd8038de79f55024b23ecad108fcd4..8a8ee6c104a69c4cb5af704b715deda7187e4d59 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -328,7 +328,7 @@ let s:filename_checks = {
     \ 'lpc': ['file.lpc', 'file.ulpc'],
     \ 'lsl': ['file.lsl'],
     \ 'lss': ['file.lss'],
-    \ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
+    \ 'lua': ['file.lua', 'file.rockspec', 'file.nse', '.luacheckrc'],
     \ 'lynx': ['lynx.cfg'],
     \ 'lyrics': ['file.lrc'],
     \ 'm3build': ['m3makefile', 'm3overrides'],

diff --git a/src/version.c b/src/version.c
index f6b88274a7a348297f26f2e132f5047ac17e307f..c96585e8063c3f1978df4c49c49f4e8f4166afbe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/