aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-06-07 10:39:58 -0400
committerJames McCoy <jamessan@jamessan.com>2016-06-07 12:02:56 -0400
commite453825aa5c702b22faa7acb0b1226e60a539d59 (patch)
treea207dae9ecb2cdbb17de8df3783f55c21f5e4ddd /runtime/syntax
parent8849c209cc0ae94d60a814b55397d80c2c16a185 (diff)
downloadrneovim-e453825aa5c702b22faa7acb0b1226e60a539d59.tar.gz
rneovim-e453825aa5c702b22faa7acb0b1226e60a539d59.tar.bz2
rneovim-e453825aa5c702b22faa7acb0b1226e60a539d59.zip
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
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/c.vim4
1 files changed, 2 insertions, 2 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")