From 28300a1293b17072c1c5f053a55aae2268454246 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 19 Jun 2016 23:59:39 -0400 Subject: vim-patch:f391327 Updated runtime files. https://github.com/vim/vim/commit/f391327adbbffb11180cf6038a92af1ed144e907 Ignore changes to * doc/todo.txt: Irrelevant for Neovim * doc/channel.txt: Channel docs * doc/tags, syntax/vim.vim: Generated at build time --- runtime/syntax/sh.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/syntax/sh.vim') diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 15a00eb516..3fc236f033 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 " Previous Maintainer: Lennart Schultz -" Last Change: Feb 16, 2016 -" Version: 144 +" Last Change: Feb 18, 2016 +" Version: 145 " 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) -- cgit From 3f689ed327be0a391f8cdd15302583c02b04b4e2 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 7 Jul 2016 23:02:08 -0400 Subject: vim-patch:7db8f6f Updated runtime files. https://github.com/vim/vim/commit/7db8f6f4f85e5d0526d23107b2a5e2334dc23354 Ignore changes to * doc/tags: Generated at build time * doc/channel.txt, doc/todo.txt: Irrelevant to Neovim * pack/dist/opt/matchit/doc/matchit.txt: matchit is enabled by default, so description of how to enable isn't needed. --- runtime/syntax/sh.vim | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'runtime/syntax/sh.vim') diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 3fc236f033..8b0a91f674 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 " Previous Maintainer: Lennart Schultz -" Last Change: Feb 18, 2016 -" Version: 145 +" Last Change: Mar 12, 2016 +" Version: 146 " 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 -- cgit From e686b613ecd349265e17d9c1f481cafac4935aef Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 7 Jul 2016 23:26:00 -0400 Subject: vim-patch:03413f4 Updated runtime files. https://github.com/vim/vim/commit/03413f44167c4b5cd0012def9bb331e2518c83cf Ignore changes to * doc/Makefile, doc/help.txt: Related to Vim's version8 documentation * doc/gui_x11.txt, doc/todo.txt, doc/vim.1, gvim.desktop, vim.desktop: Irrelevant to Neovim * doc/quickref.txt, doc/options.txt: As of yet unported 'emoji' * doc/tags, syntax/vim.vim: Generated at build time --- runtime/syntax/sh.vim | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'runtime/syntax/sh.vim') diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 8b0a91f674..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 " Previous Maintainer: Lennart Schultz -" Last Change: Mar 12, 2016 -" Version: 146 +" 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) @@ -539,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 "\" syn sync match shCaseEsacSync groupthere shCaseEsac "\" syn sync match shDoSync grouphere shDo "\" -- cgit