aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-11-27 16:26:15 +0100
committerChristian Clason <c.clason@uni-graz.at>2021-11-27 16:26:20 +0100
commit47ad1a3584cce47a062d07236bf71984550c82c6 (patch)
tree9ab6c334d2b23e20c2a33b23920bdac5e64a9f1c
parentc1c567602106a8bcc0efa63b7c1e3812b8b8fd29 (diff)
downloadrneovim-47ad1a3584cce47a062d07236bf71984550c82c6.tar.gz
rneovim-47ad1a3584cce47a062d07236bf71984550c82c6.tar.bz2
rneovim-47ad1a3584cce47a062d07236bf71984550c82c6.zip
vim-patch:8.2.3458: not all dictdconf files are recognized
Problem: Not all dictdconf files are recognized. Solution: Adjust the pattern. (Doug Kearns) https://github.com/vim/vim/commit/be01090efad242e30728275dea05420db6f96257
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a36911bbdb..e3b38889d6 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -484,7 +484,7 @@ au BufNewFile,BufRead *.desktop,*.directory setf desktop
au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
" Dictd config
-au BufNewFile,BufRead dictd.conf setf dictdconf
+au BufNewFile,BufRead dictd*.conf setf dictdconf
" Diff files
au BufNewFile,BufRead *.diff,*.rej setf diff
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 2aa20258d7..a93d8918d6 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -142,7 +142,7 @@ let s:filename_checks = {
\ 'desc': ['file.desc'],
\ 'desktop': ['file.desktop', '.directory', 'file.directory'],
\ 'dictconf': ['dict.conf', '.dictrc'],
- \ 'dictdconf': ['dictd.conf'],
+ \ 'dictdconf': ['dictd.conf', 'dictdfile.conf', 'dictd-file.conf'],
\ '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'],