diff options
| author | smjonas <jonas.strittmatter@gmx.de> | 2022-07-05 18:42:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-05 18:42:56 +0100 |
| commit | 704988f0c3598c1b0cc47f3b46f1f1229312f2bc (patch) | |
| tree | 6b93b4bdc35e08d2c2a62b2d80e23c030c3b8b35 | |
| parent | b67f0c8e495cfbfc09d6c7ff670b8162faf07b01 (diff) | |
| download | vim-git-704988f0c3598c1b0cc47f3b46f1f1229312f2bc.tar.gz | |
patch 9.0.0041: a couple of filetype patterns do not have "*" before "/etc"v9.0.0041
Problem: A couple of filetype patterns do not have "*" before "/etc".
Solution: Add the star. (Jonas Strittmatter, closes #10662)
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c7c6eab40..40f62f9df 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2389,7 +2389,7 @@ au BufNewFile,BufRead *fvwm2rc* au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom') " 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 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') " OpenBSD hostname.if -au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config') +au BufNewFile,BufRead */etc/hostname.* call s:StarSetf('config') " Pam conf au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf') diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index eba95cf12..ff4490524 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -115,7 +115,7 @@ let s:filename_checks = { \ 'coco': ['file.atg'], \ 'conaryrecipe': ['file.recipe'], \ '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'], \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'], \ 'cook': ['file.cook'], @@ -208,7 +208,7 @@ let s:filename_checks = { \ 'gemtext': ['file.gmi', 'file.gemini'], \ 'gift': ['file.gift'], \ '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'], \ 'gitrebase': ['git-rebase-todo'], \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'], @@ -706,7 +706,8 @@ let s:script_checks = { \ 'awk': [['#!/path/awk'], \ ['#!/path/gawk']], \ 'wml': [['#!/path/wml']], - \ 'scheme': [['#!/path/scheme']], + \ 'scheme': [['#!/path/scheme'], + \ ['#!/path/guile']], \ 'cfengine': [['#!/path/cfengine']], \ 'erlang': [['#!/path/escript']], \ 'haskell': [['#!/path/haskell']], diff --git a/src/version.c b/src/version.c index ed2caddd6..809f05dfa 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 41, +/**/ 40, /**/ 39, |