Patch 8.2.5054

[Bram Moolenaar]

Patch 8.2.5054
Problem: No good filetype for conf files similar to dosini.
Solution: Add the confini filetype. (closes #10510)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.5053/runtime/filetype.vim 2022-05-25 12:42:03.970091751 +0100
--- runtime/filetype.vim 2022-06-03 18:37:17.403329173 +0100
***************
*** 1290,1314 ****
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

" OPL
! au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl

" OpenSCAD
! au BufNewFile,BufRead *.scad setf openscad

" Oracle config file
! au BufNewFile,BufRead *.ora setf ora

" Org
! au BufNewFile,BufRead *.org,*.org_archive setf org

" Packet filter conf
! au BufNewFile,BufRead pf.conf setf pf

! " Pacman config
! au BufNewFile,BufRead */etc/pacman.conf setf conf

" Pacman hooks
au BufNewFile,BufRead *.hook
--- 1290,1314 ----
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

" OPL
! au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl

" OpenSCAD
! au BufNewFile,BufRead *.scad setf openscad

" Oracle config file
! au BufNewFile,BufRead *.ora setf ora

" Org
! au BufNewFile,BufRead *.org,*.org_archive setf org

" Packet filter conf
! au BufNewFile,BufRead pf.conf setf pf

! " ini style config files, using # comments
! au BufNewFile,BufRead */etc/pacman.conf,mpv.conf setf confini

" Pacman hooks
au BufNewFile,BufRead *.hook
***************
*** 1323,1358 ****
au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv

" 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

" Pascal or Puppet manifest
! au BufNewFile,BufRead *.pp call dist#ft#FTpp()

" Delphi or Lazarus program file
! au BufNewFile,BufRead *.dpr,*.lpr setf pascal

" Free Pascal makefile definition file
! au BufNewFile,BufRead *.fpc setf fpcmake

" PDF
! au BufNewFile,BufRead *.pdf setf pdf

" PCMK - HAE - crm configure edit
! au BufNewFile,BufRead *.pcmk setf pcmk

" Perl
if has("fname_case")
! au BufNewFile,BufRead *.pl,*.PL call dist#ft#FTpl()
else
! au BufNewFile,BufRead *.pl call dist#ft#FTpl()
endif
! au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl

" Perl, XPM or XPM2
au BufNewFile,BufRead *.pm
--- 1323,1358 ----
au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv

" 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

" Pascal or Puppet manifest
! au BufNewFile,BufRead *.pp call dist#ft#FTpp()

" Delphi or Lazarus program file
! au BufNewFile,BufRead *.dpr,*.lpr setf pascal

" Free Pascal makefile definition file
! au BufNewFile,BufRead *.fpc setf fpcmake

" PDF
! au BufNewFile,BufRead *.pdf setf pdf

" PCMK - HAE - crm configure edit
! au BufNewFile,BufRead *.pcmk setf pcmk

" Perl
if has("fname_case")
! au BufNewFile,BufRead *.pl,*.PL call dist#ft#FTpl()
else
! au BufNewFile,BufRead *.pl call dist#ft#FTpl()
endif
! au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl

" Perl, XPM or XPM2
au BufNewFile,BufRead *.pm
*** ../vim-8.2.5053/src/testdir/test_filetype.vim 2022-05-25 12:42:03.970091751 +0100
--- src/testdir/test_filetype.vim 2022-06-03 18:37:30.727308627 +0100
***************
*** 114,121 ****
\ 'cobol': ['file.cbl', 'file.cob', 'file.lib'],
\ 'coco': ['file.atg'],
\ 'conaryrecipe': ['file.recipe'],
! \ 'conf': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'auto.master'],
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file'],
\ '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'],
--- 114,122 ----
\ 'cobol': ['file.cbl', 'file.cob', 'file.lib'],
\ 'coco': ['file.atg'],
\ 'conaryrecipe': ['file.recipe'],
! \ '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'],
*** ../vim-8.2.5053/src/version.c 2022-06-03 17:39:43.234182363 +0100
--- src/version.c 2022-06-03 18:39:06.543162080 +0100
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 5054,
/**/

--
ARTHUR: What?
BLACK KNIGHT: None shall pass.
ARTHUR: I have no quarrel with you, good Sir knight, but I must cross
this bridge.
BLACK KNIGHT: Then you shall die.
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///