summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-27 10:35:52 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-27 10:35:52 +0000
commitbbdd3fb804bf69684f7b0f49d3c0a0b039daec02 (patch)
tree4c90b47b88451c2838800b3f53f45c2417f94acc
parent27708e6c7b6f444fd599f3dc5015336b002b874d (diff)
patch 8.2.3909: Containerfile using prefix name not recognizedv8.2.3909
Problem: Containerfile using prefix name not recognized. Solution: Recognize Containerfile.*.
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9f8dbded78..b9459f35fa 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2240,7 +2240,7 @@ au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/* call s:StarSetf('crontab
au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
" Dockerfile
-au BufNewFile,BufRead Dockerfile.* call s:StarSetf('dockerfile')
+au BufNewFile,BufRead Dockerfile.*,Containerfile.* 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 b53f563899..5c31c5fc35 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.debian'],
+ \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
\ '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 64086c3de5..62b646c33f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3909,
+/**/
3908,
/**/
3907,