aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorPerry Hung <iperry@gmail.com>2015-05-18 12:19:01 -0400
committerMichael Reed <m.reed@mykolab.com>2015-05-20 16:31:28 -0400
commit04a3d5ecc7c9f626b28f60fdd76f08e0e9c867d3 (patch)
tree0da829316f88ad7ff5090871df2ff16a817c000f /runtime/syntax
parentdac8bcd090c29b8cf8ec9d47ecc2144f22c00442 (diff)
downloadrneovim-04a3d5ecc7c9f626b28f60fdd76f08e0e9c867d3.tar.gz
rneovim-04a3d5ecc7c9f626b28f60fdd76f08e0e9c867d3.tar.bz2
rneovim-04a3d5ecc7c9f626b28f60fdd76f08e0e9c867d3.zip
vim-patch:f654ad9 #2659
Update runtime files. https://code.google.com/p/vim/source/detail?r=f654ad95fd4e25e014dda71963b9745a4bf5f83b Resolves issue #1999.
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/c.vim8
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 2e54b8c42a..128e1a2a4a 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: 2014 Sep 23
+" Last Change: 2014 Nov 13
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -61,10 +61,9 @@ else
syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
endif
-syn region cCppOut2 contained start="0" end="^\s*\(%:\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=cSpaceError,cCppSkip
syn region cCppSkip contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppSkip
-syn cluster cStringGroup contains=cCppString,cCppOut2,cCppSkip
+syn cluster cStringGroup contains=cCppString,cCppSkip
syn match cCharacter "L\='[^\\]'"
syn match cCharacter "L'[^']*'" contains=cSpecial
@@ -462,8 +461,7 @@ hi def link cTodo Todo
hi def link cBadContinuation Error
hi def link cCppOutSkip cCppOutIf2
hi def link cCppInElse2 cCppOutIf2
-hi def link cCppOutIf2 cCppOut2 " Old syntax group for #if 0 body
-hi def link cCppOut2 cCppOut " Old syntax group for #if of #if 0
+hi def link cCppOutIf2 cCppOut
hi def link cCppOut Comment
let b:current_syntax = "c"