commit 93c7a45e86934a92ec513b437fe9b8cc343c53e3
author KnoP-01 <knosowski@graeffrobotics.de> Sat Apr 16 21:14:04 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Apr 16 21:14:04 2022 +0100
tree cd28cac256b8b83f39d7bc778048df0fe98775cf
parent 047a7019b293918343998ccbdfabd48c771f5eef

patch 8.2.4766: KRL files using "deffct" not recognized

Problem:    KRL files using "deffct" not recognized.
Solution:   Adjust the pattern used for matching. (Patrick Meiser-Knosowski,
            closes #10200)

runtime/autoload/dist/ft.vim

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 4c2d20a..05a92bc 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -989,20 +989,23 @@
   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)) =~? '^\s*\%(&\w\+\|\%(global\s\+\)\?def\>\)'
+  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)) =~? '^\s*\%(&\w\+\|defdat\>\)'
+  elseif getline(nextnonblank(1)) =~? '\v^\s*%(' .. ft_krl_header .. '|' .. ft_krl_defdat .. ')'
     setf krl
   endif
 enddef

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a94002e..1bc94b5 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -768,7 +768,7 @@
 endfunc
 
 """""""""""""""""""""""""""""""""""""""""""""""""
-" Tests for specific extentions and filetypes.
+" Tests for specific extensions and filetypes.
 " Keep sorted.
 """""""""""""""""""""""""""""""""""""""""""""""""
 
@@ -1562,11 +1562,13 @@
   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!
+  " 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'

src/version.c

diff --git a/src/version.c b/src/version.c
index d4410d0..c3aad48 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4766,
+/**/
     4765,
 /**/
     4764,