patch 8.2.5054: no good filetype for conf files similar to dosini
Problem: No good filetype for conf files similar to dosini.
Solution: Add the confini filetype. (closes #10510)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index da68ff4..7ec8afc 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1290,25 +1290,25 @@
au BufNewFile,BufRead [a-zA-Z0-9]*Dict\(.*\)\=,[a-zA-Z]*Properties\(.*\)\=,*Transport\(.*\),fvSchemes,fvSolution,fvConstrains,fvModels,*/constant/g,*/0\(\.orig\)\=/* call dist#ft#FTfoam()
" OpenROAD
-au BufNewFile,BufRead *.or setf openroad
+au BufNewFile,BufRead *.or setf openroad
" OPL
-au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
+au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
" OpenSCAD
-au BufNewFile,BufRead *.scad setf openscad
+au BufNewFile,BufRead *.scad setf openscad
" Oracle config file
-au BufNewFile,BufRead *.ora setf ora
+au BufNewFile,BufRead *.ora setf ora
" Org
-au BufNewFile,BufRead *.org,*.org_archive setf org
+au BufNewFile,BufRead *.org,*.org_archive setf org
" Packet filter conf
-au BufNewFile,BufRead pf.conf setf pf
+au BufNewFile,BufRead pf.conf setf pf
-" Pacman config
-au BufNewFile,BufRead */etc/pacman.conf setf conf
+" ini style config files, using # comments
+au BufNewFile,BufRead */etc/pacman.conf,mpv.conf setf confini
" Pacman hooks
au BufNewFile,BufRead *.hook
@@ -1323,36 +1323,36 @@
au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
" PApp
-au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
+au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
" Password file
au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
" Pascal (also *.p, *.pp, *.inc)
-au BufNewFile,BufRead *.pas setf pascal
+au BufNewFile,BufRead *.pas setf pascal
" Pascal or Puppet manifest
-au BufNewFile,BufRead *.pp call dist#ft#FTpp()
+au BufNewFile,BufRead *.pp call dist#ft#FTpp()
" Delphi or Lazarus program file
-au BufNewFile,BufRead *.dpr,*.lpr setf pascal
+au BufNewFile,BufRead *.dpr,*.lpr setf pascal
" Free Pascal makefile definition file
-au BufNewFile,BufRead *.fpc setf fpcmake
+au BufNewFile,BufRead *.fpc setf fpcmake
" PDF
-au BufNewFile,BufRead *.pdf setf pdf
+au BufNewFile,BufRead *.pdf setf pdf
" PCMK - HAE - crm configure edit
-au BufNewFile,BufRead *.pcmk setf pcmk
+au BufNewFile,BufRead *.pcmk setf pcmk
" Perl
if has("fname_case")
- au BufNewFile,BufRead *.pl,*.PL call dist#ft#FTpl()
+ au BufNewFile,BufRead *.pl,*.PL call dist#ft#FTpl()
else
- au BufNewFile,BufRead *.pl call dist#ft#FTpl()
+ au BufNewFile,BufRead *.pl call dist#ft#FTpl()
endif
-au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl
+au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl
" Perl, XPM or XPM2
au BufNewFile,BufRead *.pm
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 81ad0a6..5f10aac 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -114,8 +114,9 @@
\ 'cobol': ['file.cbl', 'file.cob', 'file.lib'],
\ 'coco': ['file.atg'],
\ 'conaryrecipe': ['file.recipe'],
- \ 'conf': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'auto.master'],
+ \ 'conf': ['auto.master'],
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file'],
+ \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf'],
\ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
\ 'cook': ['file.cook'],
\ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
diff --git a/src/version.c b/src/version.c
index 0f33fb2..f578bff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5054,
+/**/
5053,
/**/
5052,