changeset 25848:86c3af1be1db v8.2.3458

patch 8.2.3458: not all dictdconf files are recognized Commit: https://github.com/vim/vim/commit/be01090efad242e30728275dea05420db6f96257 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Sep 26 22:11:52 2021 +0100 patch 8.2.3458: not all dictdconf files are recognized Problem: Not all dictdconf files are recognized. Solution: Adjust the pattern. (Doug Kearns)
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Sep 2021 23:15:03 +0200
parents e18edc5e04a2
children ecbd01ddf78d
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -488,7 +488,7 @@ au BufNewFile,BufRead *.desktop,*.direct
 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
--- 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'],
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3458,
+/**/
     3457,
 /**/
     3456,