To: vim_dev@googlegroups.com Subject: Patch 9.0.0088 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0088 Problem: Pattern for detecting bitbake files is not sufficient. Solution: Adjust the pattern. (Gregory Anders, closes #10743) Files: runtime/autoload/dist/ft.vim, src/testdir/test_filetype.vim *** ../vim-9.0.0087/runtime/autoload/dist/ft.vim 2022-07-16 17:46:41.673744844 +0100 --- runtime/autoload/dist/ft.vim 2022-07-26 21:38:25.759443722 +0100 *************** *** 519,525 **** # headers so assume POV-Ray elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords setf pascal ! elseif lines =~# '\<\%(require\|inherit\)\>' || lines =~# '\w\+ = ' setf bitbake else FTasmsyntax() --- 519,525 ---- # headers so assume POV-Ray elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords setf pascal ! elseif lines =~# '\<\%(require\|inherit\)\>' || lines =~# '[A-Z][A-Za-z0-9_:${}]*\s\+\%(??\|[?:+]\)\?= ' setf bitbake else FTasmsyntax() *** ../vim-9.0.0087/src/testdir/test_filetype.vim 2022-07-26 19:18:23.864892621 +0100 --- src/testdir/test_filetype.vim 2022-07-26 21:38:25.759443722 +0100 *************** *** 1864,1869 **** --- 1864,1894 ---- call assert_equal('bitbake', &filetype) bwipe! + call writefile(['S = "${WORKDIR}"'], 'Xfile.inc') + split Xfile.inc + call assert_equal('bitbake', &filetype) + bwipe! + + call writefile(['DEPENDS:append = " somedep"'], 'Xfile.inc') + split Xfile.inc + call assert_equal('bitbake', &filetype) + bwipe! + + call writefile(['MACHINE ??= "qemu"'], 'Xfile.inc') + split Xfile.inc + call assert_equal('bitbake', &filetype) + bwipe! + + call writefile(['PROVIDES := "test"'], 'Xfile.inc') + split Xfile.inc + call assert_equal('bitbake', &filetype) + bwipe! + + call writefile(['RDEPENDS_${PN} += "bar"'], 'Xfile.inc') + split Xfile.inc + call assert_equal('bitbake', &filetype) + bwipe! + " asm call writefile(['asmsyntax=foo'], 'Xfile.inc') split Xfile.inc *** ../vim-9.0.0087/src/version.c 2022-07-26 21:26:14.004747836 +0100 --- src/version.c 2022-07-26 21:39:44.683283753 +0100 *************** *** 737,738 **** --- 737,740 ---- { /* Add new patch number below this line */ + /**/ + 88, /**/ -- Drink wet cement and get really stoned. /// 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 ///