forked from aniani/vim
patch 8.2.1055: no filetype set for pacman config files
Problem: No filetype set for pacman config files. Solution: Recognize pacman.conf and *.hook. (Guido Cella, closes #6335)
This commit is contained in:
@@ -1134,8 +1134,17 @@ au BufNewFile,BufRead *.ora setf ora
|
|||||||
" Packet filter conf
|
" Packet filter conf
|
||||||
au BufNewFile,BufRead pf.conf setf pf
|
au BufNewFile,BufRead pf.conf setf pf
|
||||||
|
|
||||||
|
" Pacman Config (close enough to dosini)
|
||||||
|
au BufNewFile,BufRead */etc/pacman.conf setf dosini
|
||||||
|
|
||||||
|
" Pacman hooks
|
||||||
|
au BufNewFile,BufRead *.hook
|
||||||
|
\ if getline(1) == '[Trigger]' |
|
||||||
|
\ setf dosini |
|
||||||
|
\ endif
|
||||||
|
|
||||||
" Pam conf
|
" Pam conf
|
||||||
au BufNewFile,BufRead */etc/pam.conf setf pamconf
|
au BufNewFile,BufRead */etc/pam.conf setf pamconf
|
||||||
|
|
||||||
" Pam environment
|
" Pam environment
|
||||||
au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
|
au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
|
||||||
|
@@ -139,7 +139,7 @@ let s:filename_checks = {
|
|||||||
\ 'dnsmasq': ['/etc/dnsmasq.conf'],
|
\ 'dnsmasq': ['/etc/dnsmasq.conf'],
|
||||||
\ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'],
|
\ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'],
|
||||||
\ 'dosbatch': ['file.bat', 'file.sys'],
|
\ 'dosbatch': ['file.bat', 'file.sys'],
|
||||||
\ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini'],
|
\ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini'],
|
||||||
\ 'dot': ['file.dot', 'file.gv'],
|
\ 'dot': ['file.dot', 'file.gv'],
|
||||||
\ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'],
|
\ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'],
|
||||||
\ 'dsl': ['file.dsl'],
|
\ 'dsl': ['file.dsl'],
|
||||||
@@ -665,4 +665,22 @@ func Test_filetype_indent_off()
|
|||||||
close
|
close
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_hook_file()
|
||||||
|
filetype on
|
||||||
|
|
||||||
|
call writefile(['[Trigger]', 'this is pacman config'], 'Xfile.hook')
|
||||||
|
split Xfile.hook
|
||||||
|
call assert_equal('dosini', &filetype)
|
||||||
|
bwipe!
|
||||||
|
|
||||||
|
call writefile(['not pacman'], 'Xfile.hook')
|
||||||
|
split Xfile.hook
|
||||||
|
call assert_notequal('dosini', &filetype)
|
||||||
|
bwipe!
|
||||||
|
|
||||||
|
call delete('Xfile.hook')
|
||||||
|
filetype off
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -754,6 +754,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1055,
|
||||||
/**/
|
/**/
|
||||||
1054,
|
1054,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user