From e453825aa5c702b22faa7acb0b1226e60a539d59 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 7 Jun 2016 10:39:58 -0400 Subject: vim-patch:38a5563 Update runtime files. https://github.com/vim/vim/commit/38a55639d603823efcf2d2fdf542dbffdeb60b75 Ignore changes to * doc/channel.txt, doc/eval.txt, doc/various.txt: Channel related docs * doc/tags: Generated at build time * doc/todo.txt, doc/vi_diff.txt: Not relevant to neovim --- runtime/syntax/c.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/syntax') 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 -" 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") -- cgit From 48aa28a3eb074ccd903a6eb64869764be5c95b30 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 7 Jun 2016 12:06:20 -0400 Subject: vim-patch:e0fa374 Updated runtime files. https://github.com/vim/vim/commit/e0fa3742ead676a3074a10edadbc955e1a89153d Ignore changes to * doc/channel.txt: Channel related docs * doc/netbeans.txt, doc/os_dos.txt, doc/todo.txt: Not relevant to Neovim * doc/tags: Generated at build time --- runtime/syntax/sh.vim | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'runtime/syntax') 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 " Previous Maintainer: Lennart Schultz -" 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 -- cgit