patch 9.1.0291: filetype: libreoffice config files are not recognized
Commit:
https://github.com/vim/vim/commit/73c89bcf79df280b8698f77374afabd9494dc741
Author: Wu, Zhenyu <wuzhe...@ustc.edu>
Date: Tue Apr 9 22:20:55 2024 +0200
patch 9.1.0291: filetype: libreoffice config files are not recognized
Problem: filetype: libreoffice config files are not recognized
Solution: Detect Libreoffice config fils as xml/dosini
(Wu, Zhenyu)
closes: #14453
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 e84a5b614..35a0ae72b 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -514,6 +514,10 @@ au BufNewFile,BufRead s6-*
setf execline
" Fontconfig config files
au BufNewFile,BufRead fonts.conf setf xml
+" Libreoffice config files
+au BufNewFile,BufRead *.xcu,*.xlb,*.xlc,*.xba setf xml
+au BufNewFile,BufRead psprint.conf,sofficerc setf dosini
+
" 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 3321b306c..beba4d466 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -210,7 +210,7 @@ def s:GetFilenameChecks(): dict<list<string>>
dnsmasq: ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file',
'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
dockerfile: ['Containerfile', 'Dockerfile', 'dockerfile',
'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian',
'Containerfile.something'],
dosbatch: ['file.bat'],
- dosini: ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini',
'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf',
'any/etc/yum.repos.d/file', 'file.wrap', 'file.vbp', 'ja2.ini', 'JA2.INI',
'setup.cfg', 'pudb.cfg', '.coveragerc'],
+ dosini: ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini',
'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf',
'any/etc/yum.repos.d/file', 'file.wrap', 'file.vbp', 'ja2.ini', 'JA2.INI',
'setup.cfg', 'pudb.cfg', '.coveragerc', 'psprint.conf', 'sofficerc'],
dot: ['file.dot', 'file.gv'],
dracula: ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file',
'lpe', 'lvs', 'some-lpe', 'some-lvs'],
dtd: ['file.dtd'],
@@ -815,7 +815,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', 'fonts.conf',
'file.xpr', 'file.xpfm', 'file.spfm', 'file.bxml'],
+ 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'],
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 f215931ee..c9fc048a8 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 */
+/**/
+ 291,
/**/
290,
/**/
--
--
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/E1ruI6W-000qAG-HQ%40256bit.org.
