diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-26 22:11:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-26 22:11:52 +0100 |
| commit | be01090efad242e30728275dea05420db6f96257 (patch) | |
| tree | cc3b06035bb60e8b2d83fdc61a8db8c9ce203fc8 | |
| parent | b16ff292ad5f07ed5a7e36a2236b2f82c943c982 (diff) | |
| download | vim-git-8.2.3458.tar.gz | |
patch 8.2.3458: not all dictdconf files are recognizedv8.2.3458
Problem: Not all dictdconf files are recognized.
Solution: Adjust the pattern. (Doug Kearns)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 586b55f7e..90beb03ce 100644 --- 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 b34e50b23..a4d0ff940 100644 --- 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 0046bbd95..54e5c6091 100644 --- 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, |