# HG changeset patch # User Bram Moolenaar # Date 1658781903 -7200 # Node ID 27ebab59172ea2c1e56f15e8879c27bd90cabf98 # Parent 69dae6485ca8d6bf82a47f110ff93e099665d215 patch 9.0.0073: too many files recognized as bsdl Commit: https://github.com/vim/vim/commit/1b67f07f7626b87d9ce3e16815970988983a2ddc Author: Martin Tournoij Date: Mon Jul 25 21:40:06 2022 +0100 patch 9.0.0073: too many files recognized as bsdl Problem: Too many files recognized as bsdl. Solution: Use pattern "*.bsd" instead of "*bsd". (Martin Tournoij, closes #10783) diff --git a/runtime/filetype.vim b/runtime/filetype.vim --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -259,7 +259,7 @@ au BufNewFile,BufRead *.bb,*.bbappend,*. au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml " BSDL -au BufNewFile,BufRead *bsd,*.bsdl setf bsdl +au BufNewFile,BufRead *.bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -43,7 +43,9 @@ func Test_other_type() endfunc " Filetypes detected just from matching the file name. +" First one is checking that these files have no filetype. let s:filename_checks = { + \ 'none': ['bsd', 'some-bsd'], \ '8th': ['file.8th'], \ 'a2ps': ['/etc/a2ps.cfg', '/etc/a2ps/file.cfg', 'a2psrc', '.a2psrc', 'any/etc/a2ps.cfg', 'any/etc/a2ps/file.cfg'], \ 'a65': ['file.a65'], @@ -85,7 +87,7 @@ let s:filename_checks = { \ 'bindzone': ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file'], \ 'bitbake': ['file.bb', 'file.bbappend', 'file.bbclass', 'build/conf/local.conf', 'meta/conf/layer.conf', 'build/conf/bbappend.conf', 'meta-layer/conf/distro/foo.conf'], \ 'blank': ['file.bl'], - \ 'bsdl': ['file.bsd', 'file.bsdl', 'bsd', 'some-bsd'], + \ 'bsdl': ['file.bsd', 'file.bsdl'], \ 'bst': ['file.bst'], \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'], \ 'bzr': ['bzr_log.any', 'bzr_log.file'], @@ -648,7 +650,8 @@ func CheckItems(checks) if &filetype == '' && &readonly " File exists but not able to edit it (permission denied) else - call assert_equal(ft, &filetype, 'with file name: ' . names[i]) + let expected = ft == 'none' ? '' : ft + call assert_equal(expected, &filetype, 'with file name: ' . names[i]) endif bwipe! endfor diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 73, +/**/ 72, /**/ 71,