diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 22324df8b..d4ecfcb7f 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: The Vim Project -" Last Change: 2025 Mar 12 +" Last Change: 2025 Mar 18 " Former Maintainer: Bram Moolenaar " Listen very carefully, I will say this only once @@ -2660,7 +2660,7 @@ au BufNewFile,BufRead *.tla setf tla au BufNewFile,BufRead {.,}tmux*.conf setf tmux " TOML -au BufNewFile,BufRead *.toml setf toml +au BufNewFile,BufRead *.toml,uv.lock setf toml " TPP - Text Presentation Program au BufNewFile,BufRead *.tpp setf tpp diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index fe26d9256..bfebea4fe 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -818,7 +818,7 @@ def s:GetFilenameChecks(): dict> tla: ['file.tla'], tli: ['file.tli'], tmux: ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'], - toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black', + toml: ['file.toml', 'uv.lock', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black', 'any/containers/containers.conf', 'any/containers/containers.conf.d/file.conf', 'any/containers/containers.conf.modules/file.conf', 'any/containers/containers.conf.modules/any/file.conf', 'any/containers/registries.conf', 'any/containers/registries.conf.d/file.conf', diff --git a/src/version.c b/src/version.c index 93cda6cc9..606cc1e7d 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 */ +/**/ + 1220, /**/ 1219, /**/