patch 9.0.2179: no filetype detection for execline scripts
Commit:
https://github.com/vim/vim/commit/63210c214afa6589b6132bd060908a8711f4567f
Author: Mazunki Hoksaas <[email protected]>
Date: Tue Dec 19 20:44:41 2023 +0100
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 <[email protected]>
Signed-off-by: Doug Kearns <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim
index 1685093d5..f58899af3 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 4043eb428..30f8a1e16 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 f51cd719f..fe22069a5 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 498c346a9..89b224eaa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 2179,
/**/
2178,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rFgG3-003ccV-FF%40256bit.org.
