aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/c.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-06-07 16:00:31 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-06-07 16:00:31 -0400
commit00fc216e2be1f3a32fd31fb08a2ecdc66acd0543 (patch)
tree801ede4a6cc27a352a189882047c4185157fdc02 /runtime/syntax/c.vim
parent8849c209cc0ae94d60a814b55397d80c2c16a185 (diff)
parente056e5d5585b9c5118be8dba046638c872c00ba7 (diff)
downloadrneovim-00fc216e2be1f3a32fd31fb08a2ecdc66acd0543.tar.gz
rneovim-00fc216e2be1f3a32fd31fb08a2ecdc66acd0543.tar.bz2
rneovim-00fc216e2be1f3a32fd31fb08a2ecdc66acd0543.zip
Merge #4890 from jamessan/vim-38a5563
vim-patch:38a5563,e0fa374,decb14d
Diffstat (limited to 'runtime/syntax/c.vim')
-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")