diff options
| -rw-r--r-- | runtime/autoload/dist/script.vim | 4 | ||||
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 0 deletions
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim index 1685093d54..f58899af31 100644 --- a/runtime/autoload/dist/script.vim +++ b/runtime/autoload/dist/script.vim @@ -225,6 +225,10 @@ export def Exe2filetype(name: string, line1: string): string 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 4043eb428e..30f8a1e16d 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -497,6 +497,10 @@ if has("fname_case") 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 f51cd719fb..fe22069a53 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -236,6 +236,7 @@ def s:GetFilenameChecks(): dict<list<string>> 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 @@ def s:GetScriptChecks(): dict<list<list<string>>> ['#!/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 @@ def s:GetScriptEnvChecks(): dict<list<list<string>>> 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 498c346a99..89b224eaa3 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2179, +/**/ 2178, /**/ 2177, |