summaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-04-15 21:00:38 +0000
committerBram Moolenaar <Bram@vim.org>2005-04-15 21:00:38 +0000
commit402d2fea7025356c7abcb891017a1b7ddf99cbbf (patch)
tree83c5973b6316912331d4a4c070996d7888097e5c /runtime/syntax
parent4499d2ee58db42e4ec59bb2c2dbb5eeca2313e8b (diff)
downloadvim-git-402d2fea7025356c7abcb891017a1b7ddf99cbbf.tar.gz
updated for version 7.0066
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/cs.vim4
-rw-r--r--runtime/syntax/objc.vim6
-rw-r--r--runtime/syntax/xml.vim8
3 files changed, 10 insertions, 8 deletions
diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim
index 99844b965..948b12554 100644
--- a/runtime/syntax/cs.vim
+++ b/runtime/syntax/cs.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: C#
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: Tue, 09 Mar 2004 14:32:13 CET
+" Last Change: Mi, 13 Apr 2005 22:52:57 CEST
" Filenames: *.cs
" $Id$
"
@@ -92,7 +92,7 @@ syn match csSpecialChar contained +\\["\\'0abfnrtvx]+
" unicode characters
syn match csUnicodeNumber +\\\(u\x\{4}\|U\x\{8}\)+ contained contains=csUnicodeSpecifier
syn match csUnicodeSpecifier +\\[uU]+ contained
-syn region csVerbatimString start=+@"+ end=+"+ end=+$+ contains=csVerbatimSpec
+syn region csVerbatimString start=+@"+ end=+"+ end=+$+ skip=+""+ contains=csVerbatimSpec
syn match csVerbatimSpec +@"+he=s+1 contained
syn region csString start=+"+ end=+"+ end=+$+ contains=csSpecialChar,csSpecialError,csUnicodeNumber
syn match csCharacter "'[^']*'" contains=csSpecialChar,csSpecialCharError
diff --git a/runtime/syntax/objc.vim b/runtime/syntax/objc.vim
index 5a965a0f1..1c296ddbb 100644
--- a/runtime/syntax/objc.vim
+++ b/runtime/syntax/objc.vim
@@ -3,7 +3,7 @@
" Maintainer: Kazunobu Kuriyama <kazunobu.kuriyama@nifty.com>
" Ex-maintainer: Anthony Hodsdon <ahodsdon@fastmail.fm>
" First Author: Valentino Kyriakides <1kyriaki@informatik.uni-hamburg.de>
-" Last Change: 2004 May 20
+" Last Change: 2005 Apr 13
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -30,8 +30,9 @@ endif
" ObjC keywords, types, type qualifiers etc.
syn keyword objcStatement self super _cmd
-syn keyword objcType id Class SEL IMP BOOL nil Nil
+syn keyword objcType id Class SEL IMP BOOL
syn keyword objcTypeModifier bycopy in out inout oneway
+syn keyword objcConstant nil Nil
" Match the ObjC #import directive (like C's #include)
syn region objcImported display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
@@ -98,6 +99,7 @@ if version >= 508 || !exists("did_objc_syntax_inits")
HiLink objcString cString
HiLink objcSpecial Special
HiLink objcProtocol None
+ HiLink objcConstant cConstant
delcommand HiLink
endif
diff --git a/runtime/syntax/xml.vim b/runtime/syntax/xml.vim
index af6c626cf..288ea54aa 100644
--- a/runtime/syntax/xml.vim
+++ b/runtime/syntax/xml.vim
@@ -3,7 +3,7 @@
" Maintainer: Johannes Zellner <johannes@zellner.org>
" Author and previous maintainer:
" Paul Siegmann <pauls@euronet.nl>
-" Last Change: Fri, 04 Jun 2004 10:41:54 CEST
+" Last Change: Mi, 13 Apr 2005 22:40:09 CEST
" Filenames: *.xml
" $Id$
@@ -58,8 +58,8 @@ syn match xmlError "[<&]"
"
" <tag foo.attribute = "value">
" ^^^^^^^
-syn region xmlString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=xmlEntity display
-syn region xmlString contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=xmlEntity display
+syn region xmlString contained start=+"+ end=+"+ contains=xmlEntity display
+syn region xmlString contained start=+'+ end=+'+ contains=xmlEntity display
" punctuation (within attributes) e.g. <tag xml:foo.attribute ...>
@@ -233,7 +233,7 @@ else
endif
-syn keyword xmlTodo contained TODO FIXME XXX display
+syn keyword xmlTodo contained TODO FIXME XXX
syn match xmlCommentError contained "[^><!]"
syn region xmlCommentPart
\ start=+--+