diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2021-12-27 12:52:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 12:52:43 +0100 |
| commit | 9804a2870f6f308f788f939f52958e3fbd2adaac (patch) | |
| tree | 8571ab4ffaee47abc9a1c5f85a0a9b146462cf97 | |
| parent | 06ca0667a1719c7e105fd7e0844ff73cc90af0e4 (diff) | |
| parent | d54329e1b66e3c8df0877a06df4a66c6211fae07 (diff) | |
| download | rneovim-9804a2870f6f308f788f939f52958e3fbd2adaac.tar.gz rneovim-9804a2870f6f308f788f939f52958e3fbd2adaac.tar.bz2 rneovim-9804a2870f6f308f788f939f52958e3fbd2adaac.zip | |
Merge pull request #16805 from clason/vim-8.2.3905
vim-patch:8.2.{3905,3909}: Dockerfile, Containerfile using prefix name not recognized
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 2c5064489b..42f1ee219b 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -392,7 +392,8 @@ au BufNewFile,BufRead configure.in,configure.ac setf config " CUDA Compute Unified Device Architecture au BufNewFile,BufRead *.cu,*.cuh setf cuda -" Dockerfilb; Podman uses the same syntax with name Containerfile +" Dockerfile; Podman uses the same syntax with name Containerfile +" Also see Dockerfile.* below. au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile setf dockerfile " WildPackets EtherPeek Decoder @@ -2237,6 +2238,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.*,Containerfile.* call s:StarSetf('dockerfile') + " Dracula au BufNewFile,BufRead drac.* call s:StarSetf('dracula') diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 1ee23bb646..1ffa1f86dc 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/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', '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'], |