diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-07-09 06:58:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-09 06:58:27 -0400 |
| commit | adaacdd71a70b76bc686113eaece47a6264701a5 (patch) | |
| tree | 4be6079a8571316cbd89e3f310981b080f2815a4 /runtime/syntax/sh.vim | |
| parent | 6cee9d1a17177f4ccdf34283c6ed3ffaa98b32cc (diff) | |
| parent | 059e9785dc2fea0a15344162de4a5a7c8da6f491 (diff) | |
| download | rneovim-adaacdd71a70b76bc686113eaece47a6264701a5.tar.gz rneovim-adaacdd71a70b76bc686113eaece47a6264701a5.tar.bz2 rneovim-adaacdd71a70b76bc686113eaece47a6264701a5.zip | |
Merge #4648 from jamessan/packages
packages (vim-patch:7.4.{1384,1388,1396,1478,1479,1480,1486,1492,1499,1528,1550,1551,1552,1553,1554,1596,1649,1712,1840,1973,1986})
Diffstat (limited to 'runtime/syntax/sh.vim')
| -rw-r--r-- | runtime/syntax/sh.vim | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 15a00eb516..6ef5bf0d16 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> -" Last Change: Feb 16, 2016 -" Version: 144 +" Last Change: Apr 11, 2016 +" Version: 147 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) @@ -185,7 +185,7 @@ endif " Options: {{{1 " ==================== -syn match shOption "\s\zs[-+][-_a-zA-Z0-9#]\+" +syn match shOption "\s\zs[-+][-_a-zA-Z#@]\+" syn match shOption "\s\zs--[^ \t$`'"|);]\+" " File Redirection Highlighted As Operators: {{{1 @@ -317,7 +317,8 @@ syn match shColon '^\s*\zs:' " String And Character Constants: {{{1 "================================ -syn match shNumber "-\=\<\d\+\>#\=" +syn match shNumber "\<\d\+\>#\=" +syn match shNumber "-\=\.\=\d\+\>#\=" syn match shCtrlSeq "\\\d\d\d\|\\[abcfnrtv0]" contained if exists("b:is_bash") syn match shSpecial "\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained @@ -538,13 +539,20 @@ endif " Synchronization: {{{1 " ================ -if !exists("sh_minlines") - let sh_minlines = 200 +if !exists("g:sh_minlines") + let s:sh_minlines = 200 +else + let s:sh_minlines= g:sh_minlines endif -if !exists("sh_maxlines") - let sh_maxlines = 2 * sh_minlines +if !exists("g:sh_maxlines") + let s:sh_maxlines = 2*s:sh_minlines + if s:sh_maxlines < 25 + let s:sh_maxlines= 25 + endif +else + let s:sh_maxlines= g:sh_maxlines endif -exec "syn sync minlines=" . sh_minlines . " maxlines=" . sh_maxlines +exec "syn sync minlines=" . s:sh_minlines . " maxlines=" . s:sh_maxlines syn sync match shCaseEsacSync grouphere shCaseEsac "\<case\>" syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>" syn sync match shDoSync grouphere shDo "\<do\>" |