diff options
Diffstat (limited to 'runtime/syntax')
| -rw-r--r-- | runtime/syntax/c.vim | 4 | ||||
| -rw-r--r-- | runtime/syntax/sh.vim | 9 | 
2 files changed, 9 insertions, 4 deletions
| diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim index ac4909edba..32b63e09e4 100644 --- a/runtime/syntax/c.vim +++ b/runtime/syntax/c.vim @@ -1,7 +1,7 @@  " Vim syntax file  " Language:	C  " Maintainer:	Bram Moolenaar <Bram@vim.org> -" Last Change:	2015 Mar 05 +" Last Change:	2016 Feb 08  " Quit when a (custom) syntax file was already loaded  if exists("b:current_syntax") @@ -264,7 +264,7 @@ syn keyword	cStorageClass	static register auto volatile extern const  if exists("c_gnu")    syn keyword	cStorageClass	inline __attribute__  endif -if !exists("c_no_c99") +if !exists("c_no_c99") && s:ft !=# 'cpp'    syn keyword	cStorageClass	inline restrict  endif  if !exists("c_no_c11") diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 909ead81f1..15a00eb516 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:		Dec 11, 2015 -" Version:		143 +" Last Change:		Feb 16, 2016 +" Version:		144  " 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) @@ -85,6 +85,11 @@ if g:sh_fold_enabled && &fdm == "manual"   setl fdm=syntax  endif +" set up the syntax-highlighting iskeyword +if has("patch-7.4.1141") + exe "syn iskeyword ".&iskeyword.",-" +endif +  " Set up folding commands for shell {{{1  " =================================  if s:sh_fold_functions | 
