thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4448: filetype detection is failing

Browse Source 
Problem:    Filetype detection is failing.
Solution:   Do not use "s:" where it is no longer allowed.
This commit is contained in:
Bram Moolenaar
2022-02-22 21:17:40 +00:00
parent afa048f0d4
commit b2c72359dc
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/autoload/dist/ft.vim vendored
View File

@@ -83,7 +83,7 @@ export def FTbas()
setf freebasic setf freebasic
elseif match(lines, qb64_preproc) > -1 elseif match(lines, qb64_preproc) > -1
setf qb64 setf qb64
elseif match(lines, s:ft_visual_basic_content) > -1 elseif match(lines, ft_visual_basic_content) > -1
setf vb setf vb
else else
setf basic setf basic
@@ -241,7 +241,7 @@ export def FTfrm()
var lines = getline(1, min([line("$"), 5])) var lines = getline(1, min([line("$"), 5]))
if match(lines, s:ft_visual_basic_content) > -1 if match(lines, ft_visual_basic_content) > -1
setf vb setf vb
else else
setf form setf form
@@ -434,7 +434,7 @@ export def FTinc()
setf php setf php
# Pascal supports // comments but they're vary rarely used for file # Pascal supports // comments but they're vary rarely used for file
# headers so assume POV-Ray # headers so assume POV-Ray
elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? ft_pascal_keywords
setf pascal setf pascal
else else
FTasmsyntax() FTasmsyntax()
@@ -496,7 +496,7 @@ export def FTprogress_pascal()
var lnum = 1 var lnum = 1
while lnum <= 10 && lnum < line('$') while lnum <= 10 && lnum < line('$')
var line = getline(lnum) var line = getline(lnum)
if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
setf pascal setf pascal
return return
elseif line !~ '^\s*$' || line =~ '^/\*' elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -514,7 +514,7 @@ export def FTpp()
exe "setf " .. g:filetype_pp exe "setf " .. g:filetype_pp
else else
var line = getline(nextnonblank(1)) var line = getline(nextnonblank(1))
if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords if line =~ ft_pascal_comments || line =~? ft_pascal_keywords
setf pascal setf pascal
else else
setf puppet setf puppet
@@ -685,8 +685,8 @@ export def FTRules()
endtry endtry
var dir = expand('<amatch>:p:h') var dir = expand('<amatch>:p:h')
for line in config_lines for line in config_lines
if line =~ s:ft_rules_udev_rules_pattern if line =~ ft_rules_udev_rules_pattern
var udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "") var udev_rules = substitute(line, ft_rules_udev_rules_pattern, '\1', "")
if dir == udev_rules if dir == udev_rules
setf udevrules setf udevrules
endif endif

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4448,
/**/ /**/
4447, 4447,
/**/ /**/