From 6c8bc37a1083d17447156592f6f52da2d40b4855 Mon Sep 17 00:00:00 2001 From: Maxime Brunet Date: Thu, 20 Oct 2022 20:52:44 +0100 Subject: [PATCH] patch 9.0.0808: jsonnet filetype detection has a typo Problem: jsonnet filetype detection has a typo. Solution: Change "libjsonnet" to "libsonnet". (Maxime Brunet, closes #11412) --- runtime/filetype.vim | 2 +- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index b802efa2b..9feccd54e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1004,7 +1004,7 @@ au BufNewFile,BufRead .babelrc,.eslintrc,.prettierrc,.firebaserc setf json au BufNewFile,BufRead *.jsonc setf jsonc " Jsonnet -au BufNewFile,BufRead *.jsonnet,*.libjsonnet setf jsonnet +au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet " Julia au BufNewFile,BufRead *.jl setf julia diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index c6bacfbf7..c1225a504 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -289,7 +289,7 @@ let s:filename_checks = { \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'], \ 'json5': ['file.json5'], \ 'jsonc': ['file.jsonc'], - \ 'jsonnet': ['file.jsonnet', 'file.libjsonnet'], + \ 'jsonnet': ['file.jsonnet', 'file.libsonnet'], \ 'jsp': ['file.jsp'], \ 'julia': ['file.jl'], \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], diff --git a/src/version.c b/src/version.c index 6456028f1..21ff6c2fd 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 808, /**/ 807, /**/