Mercurial > vim

changeset 30948:cdb345a925d0 v9.0.0808

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0808: jsonnet filetype detection has a typo Commit: https://github.com/vim/vim/commit/6c8bc37a1083d17447156592f6f52da2d40b4855 Author: Maxime Brunet <max@brnt.mx> Date: Thu Oct 20 20:52:44 2022 +0100 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 https://github.com/vim/vim/issues/11412)
author Bram Moolenaar <Bram@vim.org>
date Thu, 20 Oct 2022 22:00:04 +0200
parents b1b4e0ce2b24
children eff8e7d8d825
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1004,7 +1004,7 @@ au BufNewFile,BufRead .babelrc,.eslintrc
 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
--- 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'],
--- 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 */
 /**/
+    808,
+/**/
     807,
 /**/
     806,