diff options
| author | Martin Tournoij <martin@arp242.net> | 2022-07-25 21:40:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-25 21:40:06 +0100 |
| commit | 1b67f07f7626b87d9ce3e16815970988983a2ddc (patch) | |
| tree | ae1e42c4cb9ffdaeb34ead5befc0aef0cf166fa7 | |
| parent | 6d023f98dfbad6215a4e94ed7df28f8972b3ff9d (diff) | |
patch 9.0.0073: too many files recognized as bsdlv9.0.0073
Problem: Too many files recognized as bsdl.
Solution: Use pattern "*.bsd" instead of "*bsd". (Martin Tournoij,
closes #10783)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 761ed3f283..ce3838d10e 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -259,7 +259,7 @@ au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/ 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 index 4be8cdc9bd..b5044297a8 100644 --- 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 index ed01c9e5cb..6d7aede80c 100644 --- 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, |