To: vim_dev@googlegroups.com Subject: Patch 8.2.4766 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4766 Problem: KRL files using "deffct" not recognized. Solution: Adjust the pattern used for matching. (Patrick Meiser-Knosowski, closes #10200) Files: runtime/autoload/dist/ft.vim, src/testdir/test_filetype.vim *** ../vim-8.2.4765/runtime/autoload/dist/ft.vim 2022-04-13 20:45:33.343510618 +0100 --- runtime/autoload/dist/ft.vim 2022-04-16 21:04:20.325327510 +0100 *************** *** 989,1008 **** 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 --- 989,1011 ---- setf tf enddef + var ft_krl_header = '\&\w+' # Determine if a *.src file is Kuka Robot Language export def FTsrc() + var ft_krl_def_or_deffct = '%(global\s+)?def%(fct)?>' if exists("g:filetype_src") exe "setf " .. g:filetype_src ! elseif getline(nextnonblank(1)) =~? '\v^\s*%(' .. ft_krl_header .. '|' .. ft_krl_def_or_deffct .. ')' setf krl endif enddef # Determine if a *.dat file is Kuka Robot Language export def FTdat() + var ft_krl_defdat = 'defdat>' if exists("g:filetype_dat") exe "setf " .. g:filetype_dat ! elseif getline(nextnonblank(1)) =~? '\v^\s*%(' .. ft_krl_header .. '|' .. ft_krl_defdat .. ')' setf krl endif enddef *** ../vim-8.2.4765/src/testdir/test_filetype.vim 2022-04-13 20:45:33.343510618 +0100 --- src/testdir/test_filetype.vim 2022-04-16 21:11:12.525529508 +0100 *************** *** 768,774 **** endfunc """"""""""""""""""""""""""""""""""""""""""""""""" ! " Tests for specific extentions and filetypes. " Keep sorted. """"""""""""""""""""""""""""""""""""""""""""""""" --- 768,774 ---- endfunc """"""""""""""""""""""""""""""""""""""""""""""""" ! " Tests for specific extensions and filetypes. " Keep sorted. """"""""""""""""""""""""""""""""""""""""""""""""" *************** *** 1561,1571 **** bwipe! call delete('srcfile.Src') ! " KRL global def with embedded spaces, file starts with empty line(s). ! call writefile(['', 'global def srcfile()'], 'srcfile.SRC') ! split srcfile.SRC ! call assert_equal('krl', &filetype) ! bwipe! " User may overrule file inspection let g:filetype_src = 'src' --- 1561,1573 ---- bwipe! call delete('srcfile.Src') ! " KRL global deffct with embedded spaces, file starts with empty line(s). ! for text in ['global def srcfile()', 'global deffct srcfile()'] ! call writefile(['', text], 'srcfile.SRC') ! split srcfile.SRC ! call assert_equal('krl', &filetype, text) ! bwipe! ! endfor " User may overrule file inspection let g:filetype_src = 'src' *** ../vim-8.2.4765/src/version.c 2022-04-16 20:42:36.624782044 +0100 --- src/version.c 2022-04-16 21:06:21.101418978 +0100 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 4766, /**/ -- A)bort, R)etry, P)lease don't bother me again /// 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 ///