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)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b802efa2b97cc4c69e3e9c38f62a3c8954d01244..9feccd54ec478f6b608934cf104e83ea22705e68 100644 (file)
--- 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 c6bacfbf71354d320100becb93be07416a2b776c..c1225a5045ba20818c06bf7afcc6c329567895f1 100644 (file)
--- 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 6456028f173ebdc673b6f05fc97064c184815d89..21ff6c2fd9e3b2898547499c640bc752d22db21e 100644 (file)
--- 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,
 /**/