From: Brandon Maier Date: Sat, 14 Dec 2024 19:56:34 +0000 (+0100) Subject: patch 9.1.0926: filetype: Pixi lock files are not recognized X-Git-Tag: v9.1.0926^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1bb90dcf711c732a49e0a45e56028a4853a17d;p=thirdparty%2Fvim.git patch 9.1.0926: filetype: Pixi lock files are not recognized Problem: filetype: Pixi lock files are not recognized Solution: detect "pixi.lock" file as yaml filetype (Brandon Maier) Reference: https://pixi.sh/latest/features/lockfile/ closes: #16212 Signed-off-by: Brandon Maier Signed-off-by: Christian Brabandt --- diff --git a/runtime/filetype.vim b/runtime/filetype.vim index cac7c2ca42..eb1d851289 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1873,6 +1873,9 @@ au BufNewFile,BufRead requires/*.txt setf requirements au BufNewFile,BufRead Pipfile setf toml au BufNewFile,BufRead Pipfile.lock setf json +" Pixi lock +au BufNewFile,BufRead pixi.lock setf yaml + " PL/1, PL/I au BufNewFile,BufRead *.pli,*.pl1 setf pli diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index e9535bf033..583cca6396 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -893,7 +893,7 @@ def s:GetFilenameChecks(): dict> xslt: ['file.xsl', 'file.xslt'], yacc: ['file.yy', 'file.yxx', 'file.y++'], yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'matplotlibrc', 'yarn.lock', - '/home/user/.kube/config', '.condarc', 'condarc'], + '/home/user/.kube/config', '.condarc', 'condarc', 'pixi.lock'], yang: ['file.yang'], yuck: ['file.yuck'], z8a: ['file.z8a'], diff --git a/src/version.c b/src/version.c index 789df38a23..caf3d5d486 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 926, /**/ 925, /**/