thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 9.0.0041: a couple of filetype patterns do not have "*" before "/etc"

Browse Source 
Problem:    A couple of filetype patterns do not have "*" before "/etc".
Solution:   Add the star. (Jonas Strittmatter, closes #10662)
This commit is contained in:
smjonas 2022-07-05 18:42:56 +01:00 committed by Bram Moolenaar
parent b67f0c8e49
commit 704988f0c3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/filetype.vim
View File

@ -2389,7 +2389,7 @@ au BufNewFile,BufRead *fvwm2rc*
au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom') au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
" Git " Git
au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/* call s:StarSetf('gitconfig') au BufNewFile,BufRead */.gitconfig.d/*,*/etc/gitconfig.d/* call s:StarSetf('gitconfig')
" Gitolite " Gitolite
au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite') au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
@ -2454,7 +2454,7 @@ au BufNewFile,BufRead neomuttrc*,Neomuttrc* call s:StarSetf('neomuttrc')
au BufNewFile,BufRead tmac.* call s:StarSetf('nroff') au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
" OpenBSD hostname.if " OpenBSD hostname.if
au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config') au BufNewFile,BufRead */etc/hostname.* call s:StarSetf('config')
" Pam conf " Pam conf
au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf') au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')

7
src/testdir/test_filetype.vim
View File

@ -115,7 +115,7 @@ let s:filename_checks = {
\ 'coco': ['file.atg'], \ 'coco': ['file.atg'],
\ 'conaryrecipe': ['file.recipe'], \ 'conaryrecipe': ['file.recipe'],
\ 'conf': ['auto.master'], \ 'conf': ['auto.master'],
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file'], \ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
\ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf'], \ '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'], \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
\ 'cook': ['file.cook'], \ 'cook': ['file.cook'],
@ -208,7 +208,7 @@ let s:filename_checks = {
\ 'gemtext': ['file.gmi', 'file.gemini'], \ 'gemtext': ['file.gmi', 'file.gemini'],
\ 'gift': ['file.gift'], \ 'gift': ['file.gift'],
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'], \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
\ 'gitconfig': ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'], \ 'gitconfig': ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
\ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'], \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
\ 'gitrebase': ['git-rebase-todo'], \ 'gitrebase': ['git-rebase-todo'],
\ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'], \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],
@ -706,7 +706,8 @@ let s:script_checks = {
\ 'awk': [['#!/path/awk'], \ 'awk': [['#!/path/awk'],
\ ['#!/path/gawk']], \ ['#!/path/gawk']],
\ 'wml': [['#!/path/wml']], \ 'wml': [['#!/path/wml']],
\ 'scheme': [['#!/path/scheme']], \ 'scheme': [['#!/path/scheme'],
\ ['#!/path/guile']],
\ 'cfengine': [['#!/path/cfengine']], \ 'cfengine': [['#!/path/cfengine']],
\ 'erlang': [['#!/path/escript']], \ 'erlang': [['#!/path/escript']],
\ 'haskell': [['#!/path/haskell']], \ 'haskell': [['#!/path/haskell']],

2
src/version.c
View File

@ -735,6 +735,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 */
/**/
41,
/**/ /**/
40, 40,
/**/ /**/