summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 028982dcbf..38db8a23b4 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1190,6 +1190,9 @@ au BufNewFile,BufRead *.lou,*.lout setf lout
" Lua
au BufNewFile,BufRead *.lua setf lua
+" Luau
+au BufNewFile,BufRead *.luau setf luau
+
" Luacheck
au BufNewFile,BufRead .luacheckrc setf lua
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 85187707dc..a68d7499a3 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -346,6 +346,7 @@ let s:filename_checks = {
\ 'lsl': ['file.lsl'],
\ 'lss': ['file.lss'],
\ 'lua': ['file.lua', 'file.rockspec', 'file.nse', '.luacheckrc', '.busted'],
+ \ 'luau': ['file.luau'],
\ 'lynx': ['lynx.cfg'],
\ 'lyrics': ['file.lrc'],
\ 'm3build': ['m3makefile', 'm3overrides'],
diff --git a/src/version.c b/src/version.c
index 47b38cd295..338399c775 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1503,
+/**/
1502,
/**/
1501,