patch 8.2.4747: no filetype override for .sys files

Problem:    No filetype override for .sys files.
Solution:   Add g:filetype_sys. (Patrick Meiser-Knosowski, closes #10181)

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index ff554dfe834fe1a8d704d1682280155d6762d25c..4c2d20ae716170b072dd8972405c298c78403309 100644 (file)
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -819,7 +819,9 @@ export def FTperl(): number
 enddef
 
 export def FTsys()
-  if IsRapid()
+  if exists("g:filetype_sys")
+    exe "setf " .. g:filetype_sys
+  elseif IsRapid()
     setf rapid
   else
     setf bat

diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index b921c3db086a99a5c59ccf19cea5a414dafc80bc..f538329dfe171dc7daa3734bfc062c3da77530a4 100644 (file)
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -155,6 +155,7 @@ variables can be used to overrule the filetype used for certain extensions:
        *.pp            g:filetype_pp   |ft-pascal-syntax|
        *.prg           g:filetype_prg
        *.src           g:filetype_src
+       *.sys           g:filetype_sys
        *.sh            g:bash_is_sh    |ft-sh-syntax|
        *.tex           g:tex_flavor    |ft-tex-plugin|
        *.w             g:filetype_w    |ft-cweb-syntax|

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 34868d60149c46cb2eb85045fd08ae627b714338..a94002e086a110a6a7fe4f56565825c61e31dee1 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1501,7 +1501,7 @@ endfunc
 func Test_sc_file()
   filetype on
 
-  " SC file mehtods are defined 'Class : Method'
+  " SC file methods are defined 'Class : Method'
   call writefile(['SCNvimDocRenderer : SCDocHTMLRenderer {'], 'srcfile.sc')
   split srcfile.sc
   call assert_equal('supercollider', &filetype)
@@ -1588,6 +1588,13 @@ func Test_sys_file()
   call assert_equal('bat', &filetype)
   bwipe!
 
+  " Users preference set by g:filetype_sys
+  let g:filetype_sys = 'sys'
+  split sysfile.sys
+  call assert_equal('sys', &filetype)
+  unlet g:filetype_sys
+  bwipe!
+
   " RAPID header start with a line containing only "%%%", 
   " but is not always present.
   call writefile(['%%%'], 'sysfile.sys')

diff --git a/src/version.c b/src/version.c
index e3ba0c89fedfd3034ba30dbfdec7d139dc776ecf..9f9917726ff250ea51c9e6281992466f9e95f19d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4747,
 /**/
     4746,
 /**/