To: vim_dev@googlegroups.com Subject: Patch 9.0.0073 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0073 Problem: Too many files recognized as bsdl. Solution: Use pattern "*.bsd" instead of "*bsd". (Martin Tournoij, closes #10783) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-9.0.0072/runtime/filetype.vim 2022-07-16 17:46:41.673744844 +0100 --- runtime/filetype.vim 2022-07-25 21:39:31.941515248 +0100 *************** *** 259,265 **** au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml " BSDL ! au BufNewFile,BufRead *bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl --- 259,265 ---- au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old setf xml " BSDL ! au BufNewFile,BufRead *.bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE setf bzl *** ../vim-9.0.0072/src/testdir/test_filetype.vim 2022-07-16 17:46:41.673744844 +0100 --- src/testdir/test_filetype.vim 2022-07-25 21:38:54.397619519 +0100 *************** *** 43,49 **** --- 43,51 ---- 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,91 **** \ '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'], \ 'bst': ['file.bst'], \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'], \ 'bzr': ['bzr_log.any', 'bzr_log.file'], --- 87,93 ---- \ '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'], \ 'bst': ['file.bst'], \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'], \ 'bzr': ['bzr_log.any', 'bzr_log.file'], *************** *** 648,654 **** if &filetype == '' && &readonly " File exists but not able to edit it (permission denied) else ! call assert_equal(ft, &filetype, 'with file name: ' . names[i]) endif bwipe! endfor --- 650,657 ---- if &filetype == '' && &readonly " File exists but not able to edit it (permission denied) else ! let expected = ft == 'none' ? '' : ft ! call assert_equal(expected, &filetype, 'with file name: ' . names[i]) endif bwipe! endfor *** ../vim-9.0.0072/src/version.c 2022-07-25 21:15:40.878155498 +0100 --- src/version.c 2022-07-25 21:30:35.219415312 +0100 *************** *** 737,738 **** --- 737,740 ---- { /* Add new patch number below this line */ + /**/ + 73, /**/ -- I have a watch cat! Just break in and she'll watch. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///