patch 8.2.3458: not all dictdconf files are recognized

Problem:    Not all dictdconf files are recognized.
Solution:   Adjust the pattern. (Doug Kearns)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 586b55f7ee477a2aa0271f4b6dff000506d211ab..90beb03ce899e8c0dd191297bcf89a51888d18d1 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -488,7 +488,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b34e50b23adcb48b76eeb89d05aad3645e4c309d..a4d0ff94016b2e7a031e18e88f5d29b0d61d4b7d 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/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'],

diff --git a/src/version.c b/src/version.c
index 0046bbd958517f9ccf4f07606a5d0d7b0cc6ac9c..54e5c609103214d3a68a6d161fdeb65915689827 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3458,
 /**/
     3457,
 /**/