From 32b7e3a8c99d369b02154df74cbe42a37c7c7e68 Mon Sep 17 00:00:00 2001 From: GustavEikaas Date: Mon, 30 Dec 2024 10:01:36 +0100 Subject: [PATCH] patch 9.1.0977: filetype: msbuild filetypes are not recognized Problem: filetype: msbuild filetypes are not recognized Solution: detect msbuild files as xml filetype (Gustav Eikaas) closes: #16339 Signed-off-by: GustavEikaas Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 5 ++++- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 7548576830..4244e0ce69 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: 2024 Dec 12 +" Last Change: 2024 Dec 30 " Former Maintainer: Bram Moolenaar " Listen very carefully, I will say this only once @@ -2916,6 +2916,9 @@ au BufNewFile,BufRead *.fsproj,*.fsproj.user setf xml " VBPROJ files are Visual Studio.NET's XML-based Visual Basic project config files au BufNewFile,BufRead *.vbproj,*.vbproj.user setf xml +" MSBUILD configuration files are also XML +au BufNewFile,BufRead Directory.Packages.props,Directory.Build.targets,Directory.Build.props setf xml + " Unison Language au BufNewFile,BufRead *.u,*.uu setf unison diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 0f05d19df8..3138e7d9fc 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -891,7 +891,7 @@ def s:GetFilenameChecks(): dict> xml: ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.fsproj', 'file.fsproj.user', 'file.vbproj', 'file.vbproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl', 'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu', 'file.atom', 'file.rss', 'file.cdxml', 'file.psc1', 'file.mpd', 'fonts.conf', 'file.xcu', 'file.xlb', 'file.xlc', 'file.xba', 'file.xpr', - 'file.xpfm', 'file.spfm', 'file.bxml', 'file.mmi', 'file.slnx'], + 'file.xpfm', 'file.spfm', 'file.bxml', 'file.mmi', 'file.slnx', 'Directory.Packages.props', 'Directory.Build.targets', 'Directory.Build.props'], xmodmap: ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap', 'some-xmodmap-file', 'xmodmap', 'xmodmap-file'], xpm: ['file.xpm'], xpm2: ['file.xpm2'], diff --git a/src/version.c b/src/version.c index d4fd17e6c6..4ded78f005 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 */ +/**/ + 977, /**/ 976, /**/