From: Bram Moolenaar Date: Sun, 26 Dec 2021 17:31:35 +0000 (+0000) Subject: patch 8.2.3905: Dockerfile using prefix name not recognized X-Git-Tag: v8.2.3905 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c88ac94a0bdc70012558813404821fe077f1de20;p=vim patch 8.2.3905: Dockerfile using prefix name not recognized Problem: Dockerfile using prefix name not recognized. Solution: Recognize Dockerfile.*. (closes #9410) --- diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ef98589b5..9f8dbded7 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -397,6 +397,7 @@ au BufNewFile,BufRead configure.in,configure.ac setf config au BufNewFile,BufRead *.cu,*.cuh setf cuda " Dockerfile; Podman uses the same syntax with name Containerfile +" Also see Dockerfile.* below. au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile setf dockerfile " WildPackets EtherPeek Decoder @@ -2238,6 +2239,9 @@ au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/* call s:StarSetf('crontab " dnsmasq(8) configuration au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq') +" Dockerfile +au BufNewFile,BufRead Dockerfile.* call s:StarSetf('dockerfile') + " Dracula au BufNewFile,BufRead drac.* call s:StarSetf('dracula') diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 8fb7d9294..b53f56389 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -146,7 +146,7 @@ let s:filename_checks = { \ 'diff': ['file.diff', 'file.rej'], \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS', 'any/etc/DIR_COLORS'], \ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'], - \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'], + \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile', 'Dockerfile.debian'], \ 'dosbatch': ['file.bat', 'file.sys'], \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/pacman.conf', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap'], \ 'dot': ['file.dot', 'file.gv'], diff --git a/src/version.c b/src/version.c index 809f60e67..719fe2aaa 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3905, /**/ 3904, /**/