updated for version 7.0e05
diff --git a/runtime/syntax/a2ps.vim b/runtime/syntax/a2ps.vim
index a559443..2a87d62 100644
--- a/runtime/syntax/a2ps.vim
+++ b/runtime/syntax/a2ps.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: a2ps(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/alsaconf.vim b/runtime/syntax/alsaconf.vim
index f2bda18..8fd51f0 100644
--- a/runtime/syntax/alsaconf.vim
+++ b/runtime/syntax/alsaconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: alsaconf(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/arch.vim b/runtime/syntax/arch.vim
index b9789d2..1e7856d 100644
--- a/runtime/syntax/arch.vim
+++ b/runtime/syntax/arch.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: GNU Arch inventory file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/bdf.vim b/runtime/syntax/bdf.vim
index e79a648..d0c73eb 100644
--- a/runtime/syntax/bdf.vim
+++ b/runtime/syntax/bdf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: BDF font definition
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-27
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/calendar.vim b/runtime/syntax/calendar.vim
index c47ef32..588b41a 100644
--- a/runtime/syntax/calendar.vim
+++ b/runtime/syntax/calendar.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: calendar(1) input file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/chordpro.vim b/runtime/syntax/chordpro.vim
new file mode 100644
index 0000000..a251a69
--- /dev/null
+++ b/runtime/syntax/chordpro.vim
@@ -0,0 +1,67 @@
+" Vim syntax file
+" Language: ChordPro (v. 3.6.2)
+" Maintainer: Niels Bo Andersen <niels@niboan.dk>
+" Last Change: 2006 Apr 20
+" Remark: Requires VIM version 6.00 or greater
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+ finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn case ignore
+
+syn keyword chordproDirective contained
+ \ start_of_chorus soc end_of_chorus eoc new_song ns no_grid ng grid g
+ \ new_page np new_physical_page npp start_of_tab sot end_of_tab eot
+ \ column_break colb
+
+syn keyword chordproDirWithOpt contained
+ \ comment c comment_italic ci comment_box cb title t subtitle st define
+ \ textfont textsize chordfont chordsize columns col
+
+syn keyword chordproDefineKeyword contained base-fret frets
+
+syn match chordproDirMatch /{\w*}/ contains=chordproDirective contained transparent
+syn match chordproDirOptMatch /{\w*:/ contains=chordproDirWithOpt contained transparent
+
+" Workaround for a bug in VIM 6, which causes incorrect coloring of the first {
+if version < 700
+ syn region chordproOptions start=/{\w*:/ end=/}/ contains=chordproDirOptMatch contained transparent
+ syn region chordproOptions start=/{define:/ end=/}/ contains=chordproDirOptMatch, chordproDefineKeyword contained transparent
+else
+ syn region chordproOptions start=/{\w*:/hs=e+1 end=/}/he=s-1 contains=chordproDirOptMatch contained
+ syn region chordproOptions start=/{define:/hs=e+1 end=/}/he=s-1 contains=chordproDirOptMatch, chordproDefineKeyword contained
+endif
+
+syn region chordproTag start=/{/ end=/}/ contains=chordproDirMatch,chordproOptions oneline
+
+syn region chordproChord matchgroup=chordproBracket start=/\[/ end=/]/ oneline
+
+syn region chordproTab start=/{start_of_tab}\|{sot}/hs=e+1 end=/{end_of_tab}\|{eot}/he=s-1 contains=chordproTag,chordproComment keepend
+
+syn region chordproChorus start=/{start_of_chorus}\|{soc}/hs=e+1 end=/{end_of_chorus}\|{eoc}/he=s-1 contains=chordproTag,chordproChord,chordproComment keepend
+
+syn match chordproComment /^#.*/
+
+" Define the default highlighting.
+hi def link chordproDirective Statement
+hi def link chordproDirWithOpt Statement
+hi def link chordproOptions Special
+hi def link chordproChord Type
+hi def link chordproTag Constant
+hi def link chordproTab PreProc
+hi def link chordproComment Comment
+hi def link chordproBracket Constant
+hi def link chordproDefineKeyword Type
+hi def chordproChorus term=bold cterm=bold gui=bold
+
+let b:current_syntax = "chordpro"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index 8dfe3d7..302417e 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -49,7 +49,7 @@
syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_REMOVE VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WRAP_EXCLUDE_FILES
\ nextgroup=cmakeArgument
syn keyword cmakeStatement
- \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDIF ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE
+ \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDIF ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE ENDMACRO
\ nextgroup=cmakeArgumnts
"syn match cmakeMacro /^\s*[A-Z_]\+/ nextgroup=cmakeArgumnts
diff --git a/runtime/syntax/context.vim b/runtime/syntax/context.vim
index 1b3d244..93b14b1 100644
--- a/runtime/syntax/context.vim
+++ b/runtime/syntax/context.vim
@@ -1,30 +1,24 @@
" Vim syntax file
" Language: ConTeXt typesetting engine
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
endif
+runtime! syntax/plaintex.vim
+
let s:cpo_save = &cpo
set cpo&vim
-syn keyword contextTodo TODO FIXME XXX NOTE
-
-syn region contextComment display oneline start='%' end='$'
- \ contains=contextTodo
-syn region contextComment display oneline start='^\s*%[CDM]' end='$'
- \ contains=ALL
-
-syn match contextStatement display '\\[a-zA-Z@]\+' contains=@NoSpell
+if !exists('g:context_include')
+ let g:context_include = ['mp', 'javascript', 'xml']
+endif
syn match contextBlockDelim display '\\\%(start\|stop\)\a\+'
\ contains=@NoSpell
-syn match contextDelimiter '[][{}]'
-
-syn match contextEscaped display '\\\_[\{}|&%$ ]'
syn region contextEscaped display matchgroup=contextPreProc
\ start='\\type\z(\A\)' end='\z1'
syn region contextEscaped display matchgroup=contextPreProc
@@ -39,34 +33,52 @@
syn region contextEscaped display matchgroup=contextPreProc
\ start='\\Typed\h\+{' end='}'
-"syn region contextMath matchgroup=contextMath start='\$' end='\$'
-" \ contains=contextStatement
-
-syn match contextBuiltin '\\\%(newif\|def\|gdef\|global\|let\|glet\|bgroup\)\>'
- \ contains=@NoSpell
-syn match contextBuiltin '\\\%(begingroup\|egroup\|endgroup\|long\|catcode\)\>'
- \ contains=@NoSpell
-syn match contextBuiltin '\\\%(unprotect\|unexpanded\|if\|else\|fi\|ifx\)\>'
- \ contains=@NoSpell
-syn match contextBuiltin '\\\%(futurelet\|protect\)\>' contains=@NoSpell
-syn match contextBuiltin '\\\%([lr]q\)\>' contains=@NoSpell
+syn match contextBuiltin display contains=@NoSpell
+ \ '\\\%(unprotect\|protect\|unexpanded\)'
syn match contextPreProc '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\).*$'
\ contains=@NoSpell
-syn match contextPreProc '^\s*\\input\s\+.*$' contains=@NoSpell
+
+if index(g:context_include, 'mp') != -1
+ syn include @mpTop syntax/mp.vim
+ unlet b:current_syntax
+
+ syn region contextMPGraphic transparent matchgroup=contextBlockDelim
+ \ start='\\start\z(\a*MPgraphic\|MP\%(page\|inclusions\|run\)\).*'
+ \ end='\\stop\z1'
+ \ contains=@mpTop
+endif
+
+" TODO: also need to implement this for \\typeC or something along those
+" lines.
+function! s:include_syntax(name, group)
+ if index(g:context_include, a:name) != -1
+ execute 'syn include @' . a:name . 'Top' 'syntax/' . a:name . '.vim'
+ unlet b:current_syntax
+ execute 'syn region context' . a:group . 'Code'
+ \ 'transparent matchgroup=contextBlockDelim'
+ \ 'start=+\\start' . a:group . '+ end=+\\stop' . a:group . '+'
+ \ 'contains=@' . a:name . 'Top'
+ endif
+endfunction
+
+call s:include_syntax('c', 'C')
+call s:include_syntax('ruby', 'Ruby')
+call s:include_syntax('javascript', 'JS')
+call s:include_syntax('xml', 'XML')
syn match contextSectioning '\\chapter\>' contains=@NoSpell
syn match contextSectioning '\\\%(sub\)*section\>' contains=@NoSpell
syn match contextSpecial '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
\ contains=@NoSpell
-syn match contextSpecial '\\[`'"]'
+syn match contextSpecial /\\[`'"]/
syn match contextSpecial +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
\ contains=@NoSpell
syn match contextSpecial '\^\^.'
syn match contextSpecial '`\%(\\.\|\^\^.\|.\)'
-syn match contextStyle '\\\%(em\|tt\|rm\|ss\|hw\|cg\)\>'
+syn match contextStyle '\\\%(em\|ss\|hw\|cg\|mf\)\>'
\ contains=@NoSpell
syn match contextFont '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
\ contains=@NoSpell
@@ -74,29 +86,18 @@
\ contains=@NoSpell
syn match contextFont '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
\ contains=@NoSpell
-syn match contextFont '\\\%(tf[abcdx]\|bfx\|[is]lx\)\>'
- \ contains=@NoSpell
-syn match contextFont '\\\%(b[fsi]\|s[cl]\|it\|os\|mf\)\>'
+syn match contextFont '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
\ contains=@NoSpell
-syn match contextDimension '[+-]\=\s*\%(\d\+\%([.,]\d*\)\=\|[.,]\d\+\)\s*\%(true\)\=\s*\%(p[tc]\|in\|bp\|c[mc]\|mm\|dd\|sp\|e[mx]\)\>'
- \ contains=@NoSpell
-
-hi def link contextTodo Todo
-hi def link contextComment Comment
-hi def link contextEscaped Special
-hi def link contextStatement Identifier
-hi def link contextMath String
hi def link contextBlockDelim Keyword
hi def link contextBuiltin Keyword
hi def link contextDelimiter Delimiter
hi def link contextPreProc PreProc
hi def link contextSectioning PreProc
hi def link contextSpecial Special
+hi def link contextType Type
hi def link contextStyle contextType
hi def link contextFont contextType
-hi def link contextType Type
-hi def link contextDimension Number
let b:current_syntax = "context"
diff --git a/runtime/syntax/crm.vim b/runtime/syntax/crm.vim
index 35d9e50..17b67d4 100644
--- a/runtime/syntax/crm.vim
+++ b/runtime/syntax/crm.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: CRM114
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/cvsrc.vim b/runtime/syntax/cvsrc.vim
index d901ae1..6c2c4ee 100644
--- a/runtime/syntax/cvsrc.vim
+++ b/runtime/syntax/cvsrc.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: cvs(1) RC file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/dictconf.vim b/runtime/syntax/dictconf.vim
index 21474fa..e7fa476 100644
--- a/runtime/syntax/dictconf.vim
+++ b/runtime/syntax/dictconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: dict(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/dictdconf.vim b/runtime/syntax/dictdconf.vim
index 5651d7c..44bf6f8 100644
--- a/runtime/syntax/dictdconf.vim
+++ b/runtime/syntax/dictdconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: dictd(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-01
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/dircolors.vim b/runtime/syntax/dircolors.vim
index 8a22b1d..da01907 100644
--- a/runtime/syntax/dircolors.vim
+++ b/runtime/syntax/dircolors.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: dircolors(1) input file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-27
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/elinks.vim b/runtime/syntax/elinks.vim
index dea04ba..5b3a3f1 100644
--- a/runtime/syntax/elinks.vim
+++ b/runtime/syntax/elinks.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: elinks(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
index 3038355..7498364 100644
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -32,7 +32,7 @@
syn keyword esterelStatement emit present await
syn keyword esterelStatement if then else
syn keyword esterelBoolean and or not xor xnor nor nand
-syn keyword esterelOperator \[ \]
+"syn keyword esterelOperator \[ \]
syn keyword esterelPippo pippo
" Esterel Types
syn keyword esterelType integer float bolean
diff --git a/runtime/syntax/eterm.vim b/runtime/syntax/eterm.vim
index 8bc4367..f6c50a2 100644
--- a/runtime/syntax/eterm.vim
+++ b/runtime/syntax/eterm.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: eterm(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-21
if exists("b:current_syntax")
finish
@@ -61,7 +61,7 @@
syn match etermColorSpec contained display '\S\+'
syn region etermColorContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+color'
+ \ start='^\s*begin\s\+color\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermColorOptions
@@ -99,7 +99,7 @@
\ nextgroup=etermNumber skipwhite
syn region etermAttrContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+attributes\'
+ \ start='^\s*begin\s\+attributes\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermAttrOptions
@@ -111,7 +111,7 @@
\ skipwhite
syn region etermIClassContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+imageclasses'
+ \ start='^\s*begin\s\+imageclasses\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermImageContext,
\ etermIClassOptions
@@ -176,7 +176,7 @@
syn region etermImageContext contained fold transparent
\ matchgroup=etermContext
- \ start='^\s*begin\s\+image'
+ \ start='^\s*begin\s\+image\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermImageOptions
@@ -193,7 +193,7 @@
syn region etermMenuItemContext contained fold transparent
\ matchgroup=etermContext
- \ start='^\s*begin\s\+menuitem'
+ \ start='^\s*begin\s\+menuitem\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermMenuItemOptions
@@ -206,7 +206,7 @@
syn match etermMenuOptions contained display '\<sep\>\|-'
syn region etermMenuContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+menu'
+ \ start='^\s*begin\s\+menu\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermMenuOptions,
\ etermMenuItemContext
@@ -227,7 +227,7 @@
syn match etermBindParam contained display '\S\+'
syn region etermActionsContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+actions'
+ \ start='^\s*begin\s\+actions\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermActionsOptions
@@ -256,7 +256,7 @@
\ skipwhite
syn region etermButtonContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+button_bar'
+ \ start='^\s*begin\s\+button_bar\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermButtonOptions
@@ -270,8 +270,8 @@
\ skipwhite
syn region etermMultiContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+multichar'
- \ end="^\s*end\>'
+ \ start='^\s*begin\s\+multichar\>'
+ \ end='^\s*end\>'
\ contains=@etermGeneral,etermMultiOptions
syn keyword etermXimOptions contained input_method
@@ -285,8 +285,8 @@
syn keyword etermPreeditType contained OverTheSpot OffTheSpot Root
syn region etermXimContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+xim'
- \ end="^\s*end\>'
+ \ start='^\s*begin\s\+xim\>'
+ \ end='^\s*end\>'
\ contains=@etermGeneral,etermXimOptions
syn keyword etermTogOptions contained map_alert visual_bell login_shell
@@ -301,7 +301,7 @@
\ skipwhite
syn region etermTogContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+toggles'
+ \ start='^\s*begin\s\+toggles\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermTogOptions
@@ -318,7 +318,7 @@
\ nextgroup=etermBoolean skipwhite
syn region etermKeyboardContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+keyboard'
+ \ start='^\s*begin\s\+keyboard\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermKeyboardOptions
@@ -330,7 +330,7 @@
\ border_width line_space
syn region etermMiscContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+misc'
+ \ start='^\s*begin\s\+misc\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermMiscOptions
@@ -351,7 +351,7 @@
\ skipwhite
syn region etermEScreenContext fold transparent matchgroup=etermContext
- \ start='^\s*begin\s\+escreen'
+ \ start='^\s*begin\s\+escreen\>'
\ end='^\s*end\>'
\ contains=@etermGeneral,etermEScreenOptions
diff --git a/runtime/syntax/fetchmail.vim b/runtime/syntax/fetchmail.vim
index 671598c..89de1ff 100644
--- a/runtime/syntax/fetchmail.vim
+++ b/runtime/syntax/fetchmail.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: fetchmail(1) RC File
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2006-01-25
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/gpg.vim b/runtime/syntax/gpg.vim
index b84c302..0fc8f00 100644
--- a/runtime/syntax/gpg.vim
+++ b/runtime/syntax/gpg.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: gpg(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/group.vim b/runtime/syntax/group.vim
index 9b3e500..ae5bfd8 100644
--- a/runtime/syntax/group.vim
+++ b/runtime/syntax/group.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: group(5) user group file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
@@ -25,7 +25,7 @@
syn match groupGIDColon contained display ':' nextgroup=groupGID
-syn match groupGID contained display '\d\+'
+syn match groupGID contained display '\d*'
\ nextgroup=groupUserListColon
syn match groupUserListColon contained display ':' nextgroup=groupUserList
diff --git a/runtime/syntax/grub.vim b/runtime/syntax/grub.vim
index 2e04d87..f63449d 100644
--- a/runtime/syntax/grub.vim
+++ b/runtime/syntax/grub.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: grub(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/indent.vim b/runtime/syntax/indent.vim
index 9310c49..ef4df5f 100644
--- a/runtime/syntax/indent.vim
+++ b/runtime/syntax/indent.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: indent(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
" indent_is_bsd: If exists, will change somewhat to match BSD implementation
"
" TODO: is the deny-all (a la lilo.vim nice or no?)...
@@ -15,7 +15,7 @@
let s:cpo_save = &cpo
set cpo&vim
-setlocal iskeyword=@,48-57,-,_
+setlocal iskeyword=@,48-57,-,+,_
syn match indentError '\S\+'
diff --git a/runtime/syntax/ld.vim b/runtime/syntax/ld.vim
index 2b39bea..fc12919 100644
--- a/runtime/syntax/ld.vim
+++ b/runtime/syntax/ld.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: ld(1) script
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/lftp.vim b/runtime/syntax/lftp.vim
index 9b346a1..7de5a56 100644
--- a/runtime/syntax/lftp.vim
+++ b/runtime/syntax/lftp.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: lftp(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/libao.vim b/runtime/syntax/libao.vim
index fdf8594..25b6e82 100644
--- a/runtime/syntax/libao.vim
+++ b/runtime/syntax/libao.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: libao.conf(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/limits.vim b/runtime/syntax/limits.vim
index f6dfd8a..a6d245a 100644
--- a/runtime/syntax/limits.vim
+++ b/runtime/syntax/limits.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: limits(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/loginaccess.vim b/runtime/syntax/loginaccess.vim
index 84a059d..07d60ee 100644
--- a/runtime/syntax/loginaccess.vim
+++ b/runtime/syntax/loginaccess.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: login.access(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/logindefs.vim b/runtime/syntax/logindefs.vim
index 2bbc6da..7c2b122 100644
--- a/runtime/syntax/logindefs.vim
+++ b/runtime/syntax/logindefs.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: login.defs(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/manconf.vim b/runtime/syntax/manconf.vim
index cdf89b9..90ecc8e 100644
--- a/runtime/syntax/manconf.vim
+++ b/runtime/syntax/manconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: man.conf(5) - man configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/modconf.vim b/runtime/syntax/modconf.vim
index 82cb980..e982b8c 100644
--- a/runtime/syntax/modconf.vim
+++ b/runtime/syntax/modconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: modules.conf(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/mplayerconf.vim b/runtime/syntax/mplayerconf.vim
index 9059206..55f7e1a 100644
--- a/runtime/syntax/mplayerconf.vim
+++ b/runtime/syntax/mplayerconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: mplayer(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/nanorc.vim b/runtime/syntax/nanorc.vim
index c13b30b..2ae4961 100644
--- a/runtime/syntax/nanorc.vim
+++ b/runtime/syntax/nanorc.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: nanorc(5) - GNU nano configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/netrc.vim b/runtime/syntax/netrc.vim
index 9d5d3ae..d8eba30 100644
--- a/runtime/syntax/netrc.vim
+++ b/runtime/syntax/netrc.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: netrc(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-27
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/pamconf.vim b/runtime/syntax/pamconf.vim
index 58eaf4b..46cd3c3 100644
--- a/runtime/syntax/pamconf.vim
+++ b/runtime/syntax/pamconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: pam(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
diff --git a/runtime/syntax/passwd.vim b/runtime/syntax/passwd.vim
index ffb979f..2261d99 100644
--- a/runtime/syntax/passwd.vim
+++ b/runtime/syntax/passwd.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: passwd(5) password file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
@@ -12,7 +12,7 @@
syn match passwdBegin display '^' nextgroup=passwdAccount
-syn match passwdAccount contained display '[a-z_][a-z0-9_-]*'
+syn match passwdAccount contained display '[+-]\=[a-z_][a-z0-9_-]*'
\ nextgroup=passwdPasswordColon
syn match passwdPasswordColon contained display ':'
@@ -26,12 +26,12 @@
syn match passwdUIDColon contained display ':' nextgroup=passwdUID
-syn match passwdUID contained display '\d\+'
+syn match passwdUID contained display '\d*'
\ nextgroup=passwdGIDColon
syn match passwdGIDColon contained display ':' nextgroup=passwdGID
-syn match passwdGID contained display '\d\+'
+syn match passwdGID contained display '\d*'
\ nextgroup=passwdGecosColon
syn match passwdGecosColon contained display ':' nextgroup=passwdGecos
@@ -47,7 +47,7 @@
syn match passwdShellColon contained display ':'
\ nextgroup=passwdShell
-syn match passwdShell contained display '[/*][^:]*'
+syn match passwdShell contained display '.*'
hi def link passwdColon Normal
hi def link passwdAccount Identifier
diff --git a/runtime/syntax/pinfo.vim b/runtime/syntax/pinfo.vim
index 88d490c..57d37d4 100644
--- a/runtime/syntax/pinfo.vim
+++ b/runtime/syntax/pinfo.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: pinfo(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/protocols.vim b/runtime/syntax/protocols.vim
index ab586bc..1dc109c 100644
--- a/runtime/syntax/protocols.vim
+++ b/runtime/syntax/protocols.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: protocols(5) - Internet protocols definition file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/quake.vim b/runtime/syntax/quake.vim
index b86d528..7840f7c 100644
--- a/runtime/syntax/quake.vim
+++ b/runtime/syntax/quake.vim
@@ -1,9 +1,11 @@
" Vim syntax file
" Language: Quake[1-3] configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
+" quake_is_quake1 - the syntax is to be used for quake1 configs
" quake_is_quake2 - the syntax is to be used for quake2 configs
" quake_is_quake3 - the syntax is to be used for quake3 configs
+" Credits: Tomasz Kalkosinski wrote the original quake3Colors stuff
if exists("b:current_syntax")
finish
@@ -20,20 +22,24 @@
\ keepend contains=quakeTodo,@Spell
syn region quakeString display oneline start=+"+ skip=+\\\\\|\\"+
- \ end=+"\|$+ contains=quakeNumbers,@quakeCommands
+ \ end=+"\|$+ contains=quakeNumbers,
+ \ @quakeCommands,@quake3Colors
syn case ignore
-syn match quakeNumbers display transparent '\<\d\|\.\d'
+syn match quakeNumbers display transparent '\<-\=\d\|\.\d'
\ contains=quakeNumber,quakeFloat,
\ quakeOctalError,quakeOctal
syn match quakeNumber contained display '\d\+\>'
-syn match quakeOctal contained display '0\o\+\>'
- \ contains=quakeOctalZero
-syn match quakeOctalZero contained display '\<0'
syn match quakeFloat contained display '\d\+\.\d*'
syn match quakeFloat contained display '\.\d\+\>'
-syn match quakeOctalError contained display '0\o*[89]\d*'
+
+if exists("quake_is_quake1") || exists("quake_is_quake2")
+ syn match quakeOctal contained display '0\o\+\>'
+ \ contains=quakeOctalZero
+ syn match quakeOctalZero contained display '\<0'
+ syn match quakeOctalError contained display '0\o*[89]\d*'
+endif
syn cluster quakeCommands contains=quakeCommand,quake1Command,
\ quake12Command,Quake2Command,Quake23Command,
@@ -80,8 +86,6 @@
syn keyword quake2Command weaplast
endif
-syn case match
-
if exists("quake_is_quake2") || exists("quake_is_quake3")
syn keyword quake23Command imagelist modellist path z_stats
endif
@@ -112,6 +116,24 @@
syn match quake3Command display "\<[+-]button\(\d\|1[0-4]\)\>"
endif
+if exists("quake_is_quake3")
+ syn cluster quake3Colors contains=quake3Red,quake3Green,quake3Yellow,
+ \ quake3Blue,quake3Cyan,quake3Purple,quake3White,
+ \ quake3Orange,quake3Grey,quake3Black,quake3Shadow
+
+ syn region quake3Red contained start=+\^1+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Green contained start=+\^2+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Yellow contained start=+\^3+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Blue contained start=+\^4+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Cyan contained start=+\^5+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Purple contained start=+\^6+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3White contained start=+\^7+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Orange contained start=+\^8+hs=e+1 end=+[$^\"\n]+he=e-1
+ syn region quake3Grey contained start=+\^9+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Black contained start=+\^0+hs=e+1 end=+[$^"\n]+he=e-1
+ syn region quake3Shadow contained start=+\^[Xx]+hs=e+1 end=+[$^"\n]+he=e-1
+endif
+
hi def link quakeComment Comment
hi def link quakeTodo Todo
hi def link quakeString String
@@ -128,6 +150,20 @@
hi def link quake3Command quakeCommands
hi def link quakeCommands Keyword
+if exists("quake_is_quake3")
+ hi quake3Red ctermfg=Red guifg=Red
+ hi quake3Green ctermfg=Green guifg=Green
+ hi quake3Yellow ctermfg=Yellow guifg=Yellow
+ hi quake3Blue ctermfg=Blue guifg=Blue
+ hi quake3Cyan ctermfg=Cyan guifg=Cyan
+ hi quake3Purple ctermfg=DarkMagenta guifg=Purple
+ hi quake3White ctermfg=White guifg=White
+ hi quake3Black ctermfg=Black guifg=Black
+ hi quake3Orange ctermfg=Brown guifg=Orange
+ hi quake3Grey ctermfg=LightGrey guifg=LightGrey
+ hi quake3Shadow cterm=underline gui=underline
+endif
+
let b:current_syntax = "quake"
let &cpo = s:cpo_save
diff --git a/runtime/syntax/racc.vim b/runtime/syntax/racc.vim
index a8a8c05..c0bfa30 100644
--- a/runtime/syntax/racc.vim
+++ b/runtime/syntax/racc.vim
@@ -1,7 +1,7 @@
" Vim default file
" Language: Racc input file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/readline.vim b/runtime/syntax/readline.vim
index cd7b10f..81175fe 100644
--- a/runtime/syntax/readline.vim
+++ b/runtime/syntax/readline.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: readline(3) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
" readline_has_bash - if defined add support for bash specific
" settings/functions
diff --git a/runtime/syntax/rnc.vim b/runtime/syntax/rnc.vim
index 3758ec5..d510f04 100644
--- a/runtime/syntax/rnc.vim
+++ b/runtime/syntax/rnc.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Relax NG compact syntax
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/screen.vim b/runtime/syntax/screen.vim
index 1baaa5b..e1ff4ec 100644
--- a/runtime/syntax/screen.vim
+++ b/runtime/syntax/screen.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: screen(1) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/sensors.vim b/runtime/syntax/sensors.vim
index 41c13e8..63cecec 100644
--- a/runtime/syntax/sensors.vim
+++ b/runtime/syntax/sensors.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sensors.conf(5) - libsensors configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/services.vim b/runtime/syntax/services.vim
index a2db7b1..661f57a 100644
--- a/runtime/syntax/services.vim
+++ b/runtime/syntax/services.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: services(5) - Internet network services list
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/setserial.vim b/runtime/syntax/setserial.vim
index 6d410f5..cdd309d 100644
--- a/runtime/syntax/setserial.vim
+++ b/runtime/syntax/setserial.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: setserial(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/sieve.vim b/runtime/syntax/sieve.vim
index fa369fc..f651cbd 100644
--- a/runtime/syntax/sieve.vim
+++ b/runtime/syntax/sieve.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Sieve filtering language input file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/slpconf.vim b/runtime/syntax/slpconf.vim
index 4b3c5a1..9fe4503 100644
--- a/runtime/syntax/slpconf.vim
+++ b/runtime/syntax/slpconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: RFC 2614 - An API for Service Location configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/slpreg.vim b/runtime/syntax/slpreg.vim
index c4e16a9..f3c8a7f 100644
--- a/runtime/syntax/slpreg.vim
+++ b/runtime/syntax/slpreg.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: RFC 2614 - An API for Service Location registration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/slpspi.vim b/runtime/syntax/slpspi.vim
index e6d0c15..8507e3d 100644
--- a/runtime/syntax/slpspi.vim
+++ b/runtime/syntax/slpspi.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: RFC 2614 - An API for Service Location SPI file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
index ba64bdf..51398ef 100644
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -94,6 +94,8 @@
HiLink sqljString String
HiLink sqljType Type
HiLink sqljPre PreProc
+
+ delcommand HiLink
endif
let b:current_syntax = "sqlj"
diff --git a/runtime/syntax/sudoers.vim b/runtime/syntax/sudoers.vim
index 81d808f..2e2d744 100644
--- a/runtime/syntax/sudoers.vim
+++ b/runtime/syntax/sudoers.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sudoers(5) configuration files
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/sysctl.vim b/runtime/syntax/sysctl.vim
index 460d0ac..d16d458 100644
--- a/runtime/syntax/sysctl.vim
+++ b/runtime/syntax/sysctl.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: sysctl.conf(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-29
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/terminfo.vim b/runtime/syntax/terminfo.vim
index 9fd7845..0ea112a 100644
--- a/runtime/syntax/terminfo.vim
+++ b/runtime/syntax/terminfo.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: terminfo(5) definition
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
@@ -74,7 +74,7 @@
syn match terminfoStrings display '\<kf\([0-9]\|[0-5][0-9]\|6[0-3]\)\>'
syn match terminfoParameters '%[%dcspl+*/mAO&|^=<>!~i?te;-]'
-syn match terminfoParameters '%\('[A-Z]'\|{[0-9]\{1,2}}\|p[1-9]\|P[a-z]\|g[A-Z]\)'
+syn match terminfoParameters "%\('[A-Z]'\|{[0-9]\{1,2}}\|p[1-9]\|P[a-z]\|g[A-Z]\)"
hi def link terminfoComment Comment
hi def link terminfoTodo Todo
diff --git a/runtime/syntax/udevconf.vim b/runtime/syntax/udevconf.vim
index 487a8ac..a294604 100644
--- a/runtime/syntax/udevconf.vim
+++ b/runtime/syntax/udevconf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: udev(8) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-01
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/udevperm.vim b/runtime/syntax/udevperm.vim
index c2029a4..9d3af09 100644
--- a/runtime/syntax/udevperm.vim
+++ b/runtime/syntax/udevperm.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: udev(8) permissions file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-01
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/udevrules.vim b/runtime/syntax/udevrules.vim
index 7deac2a..2dca878 100644
--- a/runtime/syntax/udevrules.vim
+++ b/runtime/syntax/udevrules.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: udev(8) rules file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/updatedb.vim b/runtime/syntax/updatedb.vim
index e2b7903..dd8e6f7 100644
--- a/runtime/syntax/updatedb.vim
+++ b/runtime/syntax/updatedb.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: updatedb.conf(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/xinetd.vim b/runtime/syntax/xinetd.vim
index e8e57be..9010a48 100644
--- a/runtime/syntax/xinetd.vim
+++ b/runtime/syntax/xinetd.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: xinetd.conf(5) configuration file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-06-30
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/xmodmap.vim b/runtime/syntax/xmodmap.vim
index 2b097df..69c70c5 100644
--- a/runtime/syntax/xmodmap.vim
+++ b/runtime/syntax/xmodmap.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: xmodmap(1) definition file
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish
diff --git a/runtime/syntax/yaml.vim b/runtime/syntax/yaml.vim
index 5a94fb6..9ebab70 100644
--- a/runtime/syntax/yaml.vim
+++ b/runtime/syntax/yaml.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: YAML (YAML Ain't Markup Language)
-" Maintainer: Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision: 2005-07-04
+" Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2006-04-19
if exists("b:current_syntax")
finish