8000 Merge branch 'upstream' · ATANU50/vim-cpp@da91e61 · GitHub
[go: up one dir, main page]

S 8000 kip to content

Commit da91e61

Browse files
committed
Merge branch 'upstream'
2 parents bc7fe9e + 089d5d8 commit da91e61

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

syntax/c.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: C
33
" Maintainer: Bram Moolenaar <Bram@vim.org>
4-
" Last Change: 2015 Mar 05
4+
" Last Change: 2016 Feb 08
55

66
" Quit when a (custom) syntax file was already loaded
77
if exists("b:current_syntax")
@@ -264,7 +264,7 @@ syn keyword cStorageClass static register auto volatile extern const
264264
if exists("c_gnu")
265265
syn keyword cStorageClass inline __attribute__
266266
endif
267-
if !exists("c_no_c99")
267+
if !exists("c_no_c99") && s:ft !=# 'cpp'
268268
syn keyword cStorageClass inline restrict
269269
endif
270270
if !exists("c_no_c11")

syntax/cpp.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: C++
33
" Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp)
44
" Previous Maintainer: Ken Shan <ccshan@post.harvard.edu>
5-
" Last Change: 2015 Sep 23
5+
" Last Change: 2015 Nov 10
66

77
" For version 5.x: Clear all syntax items
88
" For version 6.x: Quit when a syntax file was already loaded

0 commit comments

Comments
 (0)
0