aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.0073: too many files recognized as bsdl

Browse Source 
Problem:    Too many files recognized as bsdl.
Solution:   Use pattern "*.bsd" instead of "*bsd". (Martin Tournoij,
            closes #10783)
This commit is contained in:
Martin Tournoij 2022-07-25 21:40:06 +01:00 committed by Bram Moolenaar
parent 6d023f98df
commit 1b67f07f76
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/filetype.vim
View File

@ -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 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml
" BSDL " BSDL
au BufNewFile,BufRead *bsd,*.bsdl setf bsdl au BufNewFile,BufRead *.bsd,*.bsdl setf bsdl
" Bazel (http://bazel.io) " Bazel (http://bazel.io)
autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl

7
src/testdir/test_filetype.vim
View File

@ -43,7 +43,9 @@ func Test_other_type()
endfunc endfunc
" Filetypes detected just from matching the file name. " Filetypes detected just from matching the file name.
" First one is checking that these files have no filetype.
let s:filename_checks = { let s:filename_checks = {
\ 'none': ['bsd', 'some-bsd'],
\ '8th': ['file.8th'], \ '8th': ['file.8th'],
\ 'a2ps': ['/etc/a2ps.cfg', '/etc/a2ps/file.cfg', 'a2psrc', '.a2psrc', 'any/etc/a2ps.cfg', 'any/etc/a2ps/file.cfg'], \ 'a2ps': ['/etc/a2ps.cfg', '/etc/a2ps/file.cfg', 'a2psrc', '.a2psrc', 'any/etc/a2ps.cfg', 'any/etc/a2ps/file.cfg'],
\ 'a65': ['file.a65'], \ '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'], \ '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'], \ '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'], \ 'blank': ['file.bl'],
\ 'bsdl': ['file.bsd', 'file.bsdl', 'bsd', 'some-bsd'], \ 'bsdl': ['file.bsd', 'file.bsdl'],
\ 'bst': ['file.bst'], \ 'bst': ['file.bst'],
\ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'], \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
\ 'bzr': ['bzr_log.any', 'bzr_log.file'], \ 'bzr': ['bzr_log.any', 'bzr_log.file'],
@ -648,7 +650,8 @@ func CheckItems(checks)
if &filetype == '' && &readonly if &filetype == '' && &readonly
" File exists but not able to edit it (permission denied) " File exists but not able to edit it (permission denied)
else 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 endif
bwipe! bwipe!
endfor endfor

2
src/version.c
View File

@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
73,
/**/ /**/
72, 72,
/**/ /**/