Patch 8.2.4448

[Bram Moolenaar]

Patch 8.2.4448 (after 8.2.4447)
Problem: Filetype detection is failing.
Solution: Do not use "s:" where it is no longer allowed.
Files: runtime/autoload/dist/ft.vim,


*** ../vim-8.2.4447/runtime/autoload/dist/ft.vim 2022-02-05 19:49:29.947540471 +0000
--- runtime/autoload/dist/ft.vim 2022-02-22 21:11:38.396716308 +0000
***************
*** 83,89 ****
setf freebasic
elseif match(lines, qb64_preproc) > -1
setf qb64
! elseif match(lines, s:ft_visual_basic_content) > -1
setf vb
else
setf basic
--- 83,89 ----
setf freebasic
elseif match(lines, qb64_preproc) > -1
setf qb64
! elseif match(lines, ft_visual_basic_content) > -1
setf vb
else
setf basic
***************
*** 241,247 ****

var lines = getline(1, min([line("$"), 5]))

! if match(lines, s:ft_visual_basic_content) > -1
setf vb
else
setf form
--- 241,247 ----

var lines = getline(1, min([line("$"), 5]))

! if match(lines, ft_visual_basic_content) > -1
setf vb
else
setf form
***************
*** 434,440 ****
setf php
# Pascal supports // comments but they're vary rarely used for file
# headers so assume POV-Ray
! elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
setf pascal
else
FTasmsyntax()
--- 434,440 ----
setf php
# Pascal supports // comments but they're vary rarely used for file
# headers so assume POV-Ray
! elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords
setf pascal
else
FTasmsyntax()
***************
*** 496,502 ****
var lnum = 1
while lnum <= 10 && lnum < line('$')
var line = getline(lnum)
! if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
setf pascal
return
elseif line !~ '^\s*$' || line =~ '^/\*'
--- 496,502 ----
var lnum = 1
while lnum <= 10 && lnum < line('$')
var line = getline(lnum)
! if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
setf pascal
return
elseif line !~ '^\s*$' || line =~ '^/\*'
***************
*** 514,520 ****
exe "setf " .. g:filetype_pp
else
var line = getline(nextnonblank(1))
! if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
setf pascal
else
setf puppet
--- 514,520 ----
exe "setf " .. g:filetype_pp
else
var line = getline(nextnonblank(1))
! if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
setf pascal
else
setf puppet
***************
*** 685,692 ****
endtry
var dir = expand('<amatch>:p:h')
for line in config_lines
! if line =~ s:ft_rules_udev_rules_pattern
! var udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
if dir == udev_rules
setf udevrules
endif
--- 685,692 ----
endtry
var dir = expand('<amatch>:p:h')
for line in config_lines
! if line =~ ft_rules_udev_rules_pattern
! var udev_rules = substitute(line, ft_rules_udev_rules_pattern, '\1', "")
if dir == udev_rules
setf udevrules
endif
*** ../vim-8.2.4447/src/version.c 2022-02-22 20:42:50.382992530 +0000
--- src/version.c 2022-02-22 21:16:35.855859492 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4448,
/**/

--
From "know your smileys":
8<}} Glasses, big nose, beard

/// Bram Moolenaar -- Br...@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 ///