patch 9.0.2179: no filetype detection for execline scripts
Problem: no filetype detection for execline scripts
Solution: Add filetype detection for execline
as a prior to adding syntax support for execline (see
https://github.com/djpohly/vim-execline/issues/2), i went ahead and made
the filetype detection for execline scripts.
closes: #13689
Signed-Off-By: Mazunki Hoksaas <rolferen@gmail.com>
Signed-off-by: Doug Kearns <dougkearns@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index 1685093..f58899a 100644
--- a/runtime/autoload/dist/script.vim
+++ b/runtime/autoload/dist/script.vim
@@ -225,6 +225,10 @@
elseif name =~ '^dart\>'
return 'dart'
+ # Execline (s6)
+ elseif name =~ '^execlineb\>'
+ return 'execline'
+
endif
return ''
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 4043eb4..30f8a1e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -497,6 +497,10 @@
au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW call dist#ft#EuphoriaCheck()
endif
+" Execline (s6) scripts
+au BufNewFile,BufRead *s6*/\(up\|down\|run\|finish\) setf execline
+au BufNewFile,BufRead s6-* setf execline
+
" Lynx config files
au BufNewFile,BufRead lynx.cfg setf lynx
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index f51cd71..fe22069 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -236,6 +236,7 @@
esqlc: ['file.ec', 'file.EC'],
esterel: ['file.strl'],
eterm: ['anyEterm/file.cfg', 'Eterm/file.cfg', 'some-Eterm/file.cfg'],
+ execline: ['/etc/s6-rc/run', './s6-rc/src/dbus-srv/up', '/sbin/s6-shutdown'],
exim: ['exim.conf'],
expect: ['file.exp'],
exports: ['exports'],
@@ -915,6 +916,7 @@
['#!/path/itclsh'],
['#!/path/itkwish']],
expect: [['#!/path/expect']],
+ execline: [['#!/sbin/execlineb -S0'], ['#!/usr/bin/execlineb']],
gnuplot: [['#!/path/gnuplot']],
make: [['#!/path/make']],
nix: [['#!/path/nix-shell']],
@@ -970,6 +972,7 @@
perl: [['#!/usr/bin/env VAR=val perl']],
scala: [['#!/usr/bin/env VAR=val VVAR=vval scala']],
awk: [['#!/usr/bin/env VAR=val -i awk']],
+ execline: [['#!/usr/bin/env execlineb']],
scheme: [['#!/usr/bin/env VAR=val --ignore-environment scheme']],
python: [['#!/usr/bin/env VAR=val -S python -w -T']],
wml: [['#!/usr/bin/env VAR=val --split-string wml']],
diff --git a/src/version.c b/src/version.c
index 498c346..89b224e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2179,
+/**/
2178,
/**/
2177,