diff --git a/runtime/filetype.vim b/runtime/filetype.vim index af21a47fb7..ab5a0b7b5a 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -319,7 +319,7 @@ au BufNewFile,BufRead *.brs setf brightscript au BufNewFile,BufRead *.bsd,*.bsdl setf bsdl " Bazel (https://bazel.build) and Buck2 (https://buck2.build/) -autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE,WORKSPACE.bzlmod setf bzl +autocmd BufRead,BufNewFile *.bzl,*.bxl,*.bazel,WORKSPACE,WORKSPACE.bzlmod setf bzl if has("fname_case") " There is another check for BUILD and BUCK further below. autocmd BufRead,BufNewFile *.BUILD,BUILD,BUCK setf bzl diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 43d103908d..faa1d04cb7 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -152,7 +152,7 @@ def s:GetFilenameChecks(): dict> brightscript: ['file.brs'], bsdl: ['file.bsd', 'file.bsdl'], bst: ['file.bst'], - bzl: ['file.bazel', 'file.bzl', 'WORKSPACE', 'WORKSPACE.bzlmod'], + bzl: ['file.bazel', 'file.bzl', 'file.bxl', 'WORKSPACE', 'WORKSPACE.bzlmod'], bzr: ['bzr_log.any', 'bzr_log.file'], c: ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg', 'file.mdh', 'file.epro'], c3: ['file.c3', 'file.c3i', 'file.c3t'], diff --git a/src/version.c b/src/version.c index 4993aa8d45..a28eef78fa 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1694, /**/ 1693, /**/