From 670ecfc0cd81d7ec213591c96d45922390d109b9 Mon Sep 17 00:00:00 2001
From: Christian Clason <c.clason@uni-graz.at>
Date: Sun, 17 Apr 2022 10:15:41 +0200
Subject: vim-patch:8.2.4766: KRL files using "deffct" not recognized (#18137)

Problem:    KRL files using "deffct" not recognized.
Solution:   Adjust the pattern used for matching. (Patrick Meiser-Knosowski,
            closes vim/vim#10200)
https://github.com/vim/vim/commit/93c7a45e86934a92ec513b437fe9b8cc343c53e3
---
 runtime/autoload/dist/ft.vim | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 38fe8d4872..975e2c23d8 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -992,20 +992,23 @@ func dist#ft#FTtf()
   setf tf
 endfunc
 
+let s:ft_krl_header = '\&\w+'
 " Determine if a *.src file is Kuka Robot Language
 func dist#ft#FTsrc()
+  let 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*%(' .. s:ft_krl_header .. '|' .. ft_krl_def_or_deffct .. ')'
     setf krl
   endif
 endfunc
 
 " Determine if a *.dat file is Kuka Robot Language
 func dist#ft#FTdat()
+  let 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*%(' .. s:ft_krl_header .. '|' .. ft_krl_defdat .. ')'
     setf krl
   endif
 endfunc
-- 
cgit