To: vim_dev@googlegroups.com Subject: Patch 8.2.4701 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4701 Problem: Kuka Robot Language files not recognized. Solution: Recognize *.src and *.dat files. (Patrick Meiser-Knosowski, closes #10096) Files: runtime/filetype.vim, src/testdir/test_filetype.vim, runtime/autoload/dist/ft.vim *** ../vim-8.2.4700/runtime/filetype.vim 2022-04-02 10:48:18.834737237 +0100 --- runtime/filetype.vim 2022-04-06 18:48:59.200869076 +0100 *************** *** 951,956 **** --- 951,961 ---- " Kixtart au BufNewFile,BufRead *.kix setf kix + " Kuka Robot Language + au BufNewFile,BufRead *.src\c call dist#ft#FTsrc() + au BufNewFile,BufRead *.dat\c call dist#ft#FTdat() + au BufNewFile,BufRead *.sub\c setf krl + " Kimwitu[++] au BufNewFile,BufRead *.k setf kwt *** ../vim-8.2.4700/src/testdir/test_filetype.vim 2022-04-02 10:48:18.834737237 +0100 --- src/testdir/test_filetype.vim 2022-04-06 18:39:26.613793621 +0100 *************** *** 290,295 **** --- 290,296 ---- \ 'kivy': ['file.kv'], \ 'kix': ['file.kix'], \ 'kotlin': ['file.kt', 'file.ktm', 'file.kts'], + \ 'krl': ['file.sub', 'file.Sub', 'file.SUB'], \ 'kscript': ['file.ks'], \ 'kwt': ['file.k'], \ 'lace': ['file.ace', 'file.ACE'], *************** *** 868,873 **** --- 869,898 ---- call delete('Xfile.d') endfunc + func Test_dat_file() + filetype on + + call writefile(['&ACCESS'], 'datfile.dat') + split datfile.dat + call assert_equal('krl', &filetype) + bwipe! + call delete('datfile.dat') + + call writefile([' DEFDAT datfile'], 'datfile.Dat') + split datfile.Dat + call assert_equal('krl', &filetype) + bwipe! + call delete('datfile.Dat') + + call writefile(['', 'defdat datfile'], 'datfile.DAT') + split datfile.DAT + call assert_equal('krl', &filetype) + bwipe! + call delete('datfile.DAT') + + filetype off + endfunc + func Test_dep3patch_file() filetype on *************** *** 1310,1315 **** --- 1335,1364 ---- filetype off endfunc + func Test_src_file() + filetype on + + call writefile(['&ACCESS'], 'srcfile.src') + split srcfile.src + call assert_equal('krl', &filetype) + bwipe! + call delete('srcfile.src') + + call writefile([' DEF srcfile()'], 'srcfile.Src') + split srcfile.Src + call assert_equal('krl', &filetype) + bwipe! + call delete('srcfile.Src') + + call writefile(['', 'global def srcfile()'], 'srcfile.SRC') + split srcfile.SRC + call assert_equal('krl', &filetype) + bwipe! + call delete('srcfile.SRC') + + filetype off + endfunc + func Test_tex_file() filetype on *** ../vim-8.2.4700/runtime/autoload/dist/ft.vim 2022-03-05 13:45:52.732741446 +0000 --- runtime/autoload/dist/ft.vim 2022-04-06 18:54:45.636260846 +0100 *************** *** 896,901 **** --- 896,918 ---- setf tf enddef + # Determine if a *.src file is Kuka Robot Language + export def FTsrc() + if exists("g:filetype_src") + exe "setf " .. g:filetype_src + elseif getline(nextnonblank(1)) =~? '^\s*\%(&\w\+\|\%(global\s\+\)\?def\>\)' + setf krl + endif + enddef + + # Determine if a *.dat file is Kuka Robot Language + export def FTdat() + if exists("g:filetype_dat") + exe "setf " .. g:filetype_dat + elseif getline(nextnonblank(1)) =~? '^\s*\%(&\w\+\|defdat\>\)' + setf krl + endif + enddef # Uncomment this line to check for compilation errors early # defcompile *** ../vim-8.2.4700/src/version.c 2022-04-06 17:59:18.062549102 +0100 --- src/version.c 2022-04-06 18:38:05.469909460 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4701, /**/ -- No children may attend school with their breath smelling of "wild onions." [real standing law in West Virginia, United States of America] /// 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 ///