forked from aniani/vim
patch 9.0.0935: when using dash it may not be recognize as filetype "sh"
Problem: When using dash it may not be recognize as filetype "sh". Solution: Add checks for "dash". (Eisuke Kawashima,closes #11600)
This commit is contained in:
parent
24fe33a83a
commit
24482fbfd5
3
runtime/autoload/dist/ft.vim
vendored
3
runtime/autoload/dist/ft.vim
vendored
@ -712,7 +712,8 @@ export def SetFileTypeSH(name: string)
|
|||||||
if exists("b:is_sh")
|
if exists("b:is_sh")
|
||||||
unlet b:is_sh
|
unlet b:is_sh
|
||||||
endif
|
endif
|
||||||
elseif name =~ '\<sh\>'
|
elseif name =~ '\<sh\>' || name =~ '\<dash\>'
|
||||||
|
# Ubuntu links "sh" to "dash", thus it is expected to work the same way
|
||||||
b:is_sh = 1
|
b:is_sh = 1
|
||||||
if exists("b:is_kornshell")
|
if exists("b:is_kornshell")
|
||||||
unlet b:is_kornshell
|
unlet b:is_kornshell
|
||||||
|
4
runtime/autoload/dist/script.vim
vendored
4
runtime/autoload/dist/script.vim
vendored
@ -53,8 +53,8 @@ def DetectFromHashBang(firstline: string)
|
|||||||
name = 'wish'
|
name = 'wish'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Bourne-like shell scripts: bash bash2 ksh ksh93 sh
|
# Bourne-like shell scripts: bash bash2 dash ksh ksh93 sh
|
||||||
if name =~ '^\(bash\d*\|\|ksh\d*\|sh\)\>'
|
if name =~ '^\(bash\d*\|dash\|ksh\d*\|sh\)\>'
|
||||||
call dist#ft#SetFileTypeSH(line1)
|
call dist#ft#SetFileTypeSH(line1)
|
||||||
|
|
||||||
# csh scripts
|
# csh scripts
|
||||||
|
@ -704,6 +704,13 @@ let s:script_checks = {
|
|||||||
\ ['__libc_start_main and something']],
|
\ ['__libc_start_main and something']],
|
||||||
\ 'clojure': [['#!/path/clojure']],
|
\ 'clojure': [['#!/path/clojure']],
|
||||||
\ 'scala': [['#!/path/scala']],
|
\ 'scala': [['#!/path/scala']],
|
||||||
|
\ 'sh': [['#!/path/sh'],
|
||||||
|
\ ['#!/path/bash'],
|
||||||
|
\ ['#!/path/bash2'],
|
||||||
|
\ ['#!/path/dash'],
|
||||||
|
\ ['#!/path/ksh'],
|
||||||
|
\ ['#!/path/ksh93']],
|
||||||
|
\ 'csh': [['#!/path/csh']],
|
||||||
\ 'tcsh': [['#!/path/tcsh']],
|
\ 'tcsh': [['#!/path/tcsh']],
|
||||||
\ 'zsh': [['#!/path/zsh']],
|
\ 'zsh': [['#!/path/zsh']],
|
||||||
\ 'tcl': [['#!/path/tclsh'],
|
\ 'tcl': [['#!/path/tclsh'],
|
||||||
|
@ -695,6 +695,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 */
|
||||||
|
/**/
|
||||||
|
935,
|
||||||
/**/
|
/**/
|
||||||
934,
|
934,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user