Skip to content

Commit 704988f

Browse files
smjonasbrammool
authored andcommitted
patch 9.0.0041: a couple of filetype patterns do not have "*" before "/etc"
Problem: A couple of filetype patterns do not have "*" before "/etc". Solution: Add the star. (Jonas Strittmatter, closes #10662)
1 parent b67f0c8 commit 704988f

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

runtime/filetype.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,7 +2389,7 @@ au BufNewFile,BufRead *fvwm2rc*
23892389
au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
23902390

23912391
" Git
2392-
au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/* call s:StarSetf('gitconfig')
2392+
au BufNewFile,BufRead */.gitconfig.d/*,*/etc/gitconfig.d/* call s:StarSetf('gitconfig')
23932393

23942394
" Gitolite
23952395
au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
@@ -2454,7 +2454,7 @@ au BufNewFile,BufRead neomuttrc*,Neomuttrc* call s:StarSetf('neomuttrc')
24542454
au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
24552455

24562456
" OpenBSD hostname.if
2457-
au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
2457+
au BufNewFile,BufRead */etc/hostname.* call s:StarSetf('config')
24582458

24592459
" Pam conf
24602460
au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')

src/testdir/test_filetype.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ let s:filename_checks = {
115115
\ 'coco': ['file.atg'],
116116
\ 'conaryrecipe': ['file.recipe'],
117117
\ 'conf': ['auto.master'],
118-
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file'],
118+
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
119119
\ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf'],
120120
\ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
121121
\ 'cook': ['file.cook'],
@@ -208,7 +208,7 @@ let s:filename_checks = {
208208
\ 'gemtext': ['file.gmi', 'file.gemini'],
209209
\ 'gift': ['file.gift'],
210210
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
211-
\ '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'],
211+
\ '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'],
212212
\ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
213213
\ 'gitrebase': ['git-rebase-todo'],
214214
\ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],
@@ -706,7 +706,8 @@ let s:script_checks = {
706706
\ 'awk': [['#!/path/awk'],
707707
\ ['#!/path/gawk']],
708708
\ 'wml': [['#!/path/wml']],
709-
\ 'scheme': [['#!/path/scheme']],
709+
\ 'scheme': [['#!/path/scheme'],
710+
\ ['#!/path/guile']],
710711
\ 'cfengine': [['#!/path/cfengine']],
711712
\ 'erlang': [['#!/path/escript']],
712713
\ 'haskell': [['#!/path/haskell']],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,8 @@ static char *(features[]) =
735735

736736
static int included_patches[] =
737737
{ /* Add new patch number below this line */
738+
/**/
739+
41,
738740
/**/
739741
40,
740742
/**/

0 commit comments

Comments
 (0)