To: vim_dev@googlegroups.com
Subject: Patch 9.0.0041
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0041
Problem:    A couple of filetype patterns do not have "*" before "/etc".
Solution:   Add the star. (Jonas Strittmatter, closes #10662)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.0040/runtime/filetype.vim	2022-06-30 16:25:14.782979300 +0100
--- runtime/filetype.vim	2022-07-05 17:56:37.912095824 +0100
***************
*** 2389,2395 ****
  au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
  
  " Git
! au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
  
  " Gitolite
  au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
--- 2389,2395 ----
  au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
  
  " Git
! au BufNewFile,BufRead */.gitconfig.d/*,*/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
  
  " Gitolite
  au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
***************
*** 2454,2460 ****
  au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
  
  " OpenBSD hostname.if
! au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
  
  " Pam conf
  au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
--- 2454,2460 ----
  au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
  
  " OpenBSD hostname.if
! au BufNewFile,BufRead */etc/hostname.*		call s:StarSetf('config')
  
  " Pam conf
  au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
*** ../vim-9.0.0040/src/testdir/test_filetype.vim	2022-06-30 16:25:14.782979300 +0100
--- src/testdir/test_filetype.vim	2022-07-05 17:52:54.132714412 +0100
***************
*** 115,121 ****
      \ 'coco': ['file.atg'],
      \ 'conaryrecipe': ['file.recipe'],
      \ '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'],
--- 115,121 ----
      \ 'coco': ['file.atg'],
      \ 'conaryrecipe': ['file.recipe'],
      \ 'conf': ['auto.master'],
!     \ '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,214 ****
      \ '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'],
      \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
      \ 'gitrebase': ['git-rebase-todo'],
      \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],
--- 208,214 ----
      \ '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', '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,712 ****
        \ 'awk': [['#!/path/awk'],
        \         ['#!/path/gawk']],
        \ 'wml': [['#!/path/wml']],
!       \ 'scheme': [['#!/path/scheme']],
        \ 'cfengine': [['#!/path/cfengine']],
        \ 'erlang': [['#!/path/escript']],
        \ 'haskell': [['#!/path/haskell']],
--- 706,713 ----
        \ 'awk': [['#!/path/awk'],
        \         ['#!/path/gawk']],
        \ 'wml': [['#!/path/wml']],
!       \ 'scheme': [['#!/path/scheme'],
!       \            ['#!/path/guile']],
        \ 'cfengine': [['#!/path/cfengine']],
        \ 'erlang': [['#!/path/escript']],
        \ 'haskell': [['#!/path/haskell']],
*** ../vim-9.0.0040/src/version.c	2022-07-04 21:03:33.107829279 +0100
--- src/version.c	2022-07-05 17:55:28.120287810 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     41,
  /**/

-- 
ERROR 047: Keyboard not found.  Press RETURN to continue.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///