patch 9.1.0246: filetype: fontconfig files are not recognized
Commit:
https://github.com/vim/vim/commit/a2c27b01dc344b16849721bd934779c627665364
Author: Wu, Zhenyu <wuzhe...@ustc.edu>
Date: Sun Mar 31 19:45:11 2024 +0200
patch 9.1.0246: filetype: fontconfig files are not recognized
Problem: filetype: fontconfig files are not recognized
Solution: detect 'fonts.conf' as xml
(Wu, Zhenyu)
closes: #14367
Signed-off-by: Wu, Zhenyu <wuzhe...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index fe450b8b1..bb5205f51 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -507,6 +507,9 @@ endif
au BufNewFile,BufRead *s6*/\(up\|down\|run\|finish\) setf execline
au BufNewFile,BufRead s6-* setf execline
+" Fontconfig config files
+au BufNewFile,BufRead fonts.conf setf xml
+
" Lynx config files
au BufNewFile,BufRead lynx.cfg setf lynx
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index f3cc93902..631792c61 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -811,7 +811,7 @@ def s:GetFilenameChecks(): dict<list<string>>
xinetd: ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf',
'any/etc/xinetd.d/file'],
xkb: ['/usr/share/X11/xkb/compat/pc', '/usr/share/X11/xkb/geometry/pc',
'/usr/share/X11/xkb/keycodes/evdev', '/usr/share/X11/xkb/symbols/pc',
'/usr/share/X11/xkb/types/pc'],
xmath: ['file.msc', 'file.msf'],
- 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'],
+ 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'],
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 490812988..3b338937c 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 */
+/**/
+ 246,
/**/
245,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rqzTP-000PZP-6G%40256bit.org.
