diff options
| -rw-r--r-- | runtime/filetype.vim | 36 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 3 |
3 files changed, 23 insertions, 21 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c73f5f6cb7..a690f77379 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1286,25 +1286,25 @@ au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam 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 @@ -1319,36 +1319,36 @@ au BufNewFile,BufRead */etc/pam.conf setf pamconf 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/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index fea8ec7c9f..f5c29639c6 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -1230,9 +1230,10 @@ local filename = { Dockerfile = 'dockerfile', npmrc = 'dosini', ['/etc/yum.conf'] = 'dosini', - ['/etc/pacman.conf'] = 'conf', ['.npmrc'] = 'dosini', ['.editorconfig'] = 'dosini', + ['/etc/pacman.conf'] = 'confini', + ['mpv.conf'] = 'confini', dune = 'dune', jbuild = 'dune', ['dune-workspace'] = 'dune', @@ -1558,7 +1559,7 @@ local pattern = { ['.*/etc/DIR_COLORS'] = 'dircolors', ['.*/etc/dnsmasq%.conf'] = 'dnsmasq', ['php%.ini%-.*'] = 'dosini', - ['.*/etc/pacman%.conf'] = 'conf', + ['.*/etc/pacman%.conf'] = 'confini', ['.*/etc/yum%.conf'] = 'dosini', ['.*lvs'] = 'dracula', ['.*lpe'] = 'dracula', diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 4819c4877c..fb6c9e46aa 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -114,8 +114,9 @@ let s:filename_checks = { \ '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'], |