• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision7f5db9decf32b86d7dafab418459c32e49e5a428 (tree)
Zeit2022-07-06 02:45:05
AutorBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Log Message

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

Commit: https://github.com/vim/vim/commit/704988f0c3598c1b0cc47f3b46f1f1229312f2bc
Author: smjonas <jonas.strittmatter@gmx.de>
Date: Tue Jul 5 18:42:56 2022 +0100

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 https://github.com/vim/vim/issues/10662)

Ändern Zusammenfassung

Diff

diff -r d87fe6c8790f -r 7f5db9decf32 runtime/filetype.vim
--- a/runtime/filetype.vim Mon Jul 04 22:15:03 2022 +0200
+++ b/runtime/filetype.vim Tue Jul 05 19:45:05 2022 +0200
@@ -2389,7 +2389,7 @@
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 @@
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')
diff -r d87fe6c8790f -r 7f5db9decf32 src/testdir/test_filetype.vim
--- a/src/testdir/test_filetype.vim Mon Jul 04 22:15:03 2022 +0200
+++ b/src/testdir/test_filetype.vim Tue Jul 05 19:45:05 2022 +0200
@@ -115,7 +115,7 @@
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 @@
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 @@
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']],
diff -r d87fe6c8790f -r 7f5db9decf32 src/version.c
--- a/src/version.c Mon Jul 04 22:15:03 2022 +0200
+++ b/src/version.c Tue Jul 05 19:45:05 2022 +0200
@@ -736,6 +736,8 @@
736736 static int included_patches[] =
737737 { /* Add new patch number below this line */
738738 /**/
739+ 41,
740+/**/
739741 40,
740742 /**/
741743 39,
Show on old repository browser