Mercurial > vim

changeset 26753:c271b07a56f6 v8.2.3905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3905: Dockerfile using prefix name not recognized Commit: https://github.com/vim/vim/commit/c88ac94a0bdc70012558813404821fe077f1de20 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 26 17:31:35 2021 +0000 patch 8.2.3905: Dockerfile using prefix name not recognized Problem: Dockerfile using prefix name not recognized. Solution: Recognize Dockerfile.*. (closes https://github.com/vim/vim/issues/9410)
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Dec 2021 18:45:03 +0100
parents 275ffa6ebd3a
children ee7490e7b656
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -397,6 +397,7 @@ au BufNewFile,BufRead configure.in,confi
 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.*,
 " 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')
 
--- 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'],
--- 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 */
 /**/
+    3905,
+/**/
     3904,
 /**/
     3903,