updated for version 7.0b02v7.0b02

3 files changed, 77 insertions, 5 deletions

diff --git a/runtime/syntax/fetchmail.vim b/runtime/syntax/fetchmail.vim
index 198a3143cc..671598cbb4 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:  2005-06-27
+" Latest Revision:  2006-01-25
 
 if exists("b:current_syntax")
   finish
@@ -33,6 +33,7 @@ syn keyword fetchmailServerOpts contained via proto[col] local[domains] port
                                 \ interface monitor plugin plugout dns
                                 \ checkalias uidl interval netsec principal
                                 \ esmtpname esmtppassword
+                                \ sslcertck sslcertpath sslfingerprint
 syn match   fetchmailServerOpts contained '\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)'
 
 syn keyword fetchmailUserOpts   contained user[name] is to pass[word] ssl
diff --git a/runtime/syntax/mailaliases.vim b/runtime/syntax/mailaliases.vim
new file mode 100644
index 0000000000..de85a174fa
--- /dev/null
+++ b/runtime/syntax/mailaliases.vim
@@ -0,0 +1,71 @@
+" Vim syntax file
+" Language:         aliases(5) local alias database file
+" Maintainer:       Nikolai Weibull <nikolai@bitwi.se>
+" Latest Revision:  2006-01-14
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword mailaliasesTodo         contained TODO FIXME XXX NOTE
+
+syn region  mailaliasesComment      display oneline start='^\s*#' end='$'
+                                    \ contains=mailaliasesTodo,@Spell
+
+syn match   mailaliasesBegin        display '^'
+                                    \ nextgroup=mailaliasesName,
+                                    \ mailaliasesComment
+
+syn match   mailaliasesName         contained '[0-9A-Za-z_-]\+'
+                                    \ nextgroup=mailaliasesColon
+
+syn region  mailaliasesName         contained oneline start=+"+
+                                    \ skip=+\\\\\|\\"+ end=+"+
+                                    \ nextgroup=mailaliasesColon
+
+syn match   mailaliasesColon        contained ':'
+                                    \ nextgroup=@mailaliasesValue
+                                    \ skipwhite skipnl
+
+syn cluster mailaliasesValue        contains=mailaliasesValueAddress,
+                                    \ mailaliasesValueFile,
+                                    \ mailaliasesValueCommand,
+                                    \ mailaliasesValueInclude
+
+syn match   mailaliasesValueAddress contained '[^ \t/|,]\+'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueFile    contained '/[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueCommand contained '|[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueInclude contained ':include:[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueSep     contained ','
+                                    \ nextgroup=@mailaliasesValue
+                                    \ skipwhite skipnl
+
+hi def link mailaliasesTodo         Todo
+hi def link mailaliasesComment      Comment
+hi def link mailaliasesName         Identifier
+hi def link mailaliasesColon        Delimiter
+hi def link mailaliasesValueAddress String
+hi def link mailaliasesValueFile    String
+hi def link mailaliasesValueCommand String
+hi def link mailaliasesValueInclude PreProc
+hi def link mailaliasesValueSep     Delimiter
+
+let b:current_syntax = "mailaliases"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index 2336783f56..70ec47ed5f 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         reStructuredText documentation format
 " Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
-" Latest Revision:  2005-07-04
+" Latest Revision:  2006-03-26
 
 if exists("b:current_syntax")
   finish
@@ -32,11 +32,11 @@ syn region      rstTable            transparent start='^\n\s*+[-=+]\+' end='^$'
                                     \ contains=rstTableLines,@rstCruft
 syn match       rstTableLines       contained '^\s*[|+=-]\+$'
 syn region      rstSimpleTable      transparent
-                                    \ start='^\n\s*\%(=\+\s\+\)\%(=\+\s*\)\+$'
+                                    \ start='^\n\%(\s*\)\@>\%(\%(=\+\)\@>\%(\s\+\)\@>\)\%(\%(\%(=\+\)\@>\%(\s*\)\@>\)\+\)\@>$'
                                     \ end='^$'
                                     \ contains=rstSimpleTableLines,@rstCruft
 syn match       rstSimpleTableLines contained display
-                                    \ '^\s*\%(=\+\s\+\)\%(=\+\s*\)\+$'
+                                    \ '^\%(\s*\)\@>\%(\%(=\+\)\@>\%(\s\+\)\@>\)\%(\%(\%(=\+\)\@>\%(\s*\)\@>\)\+\)\@>$'
 
 syn region      rstFootnote         matchgroup=rstDirective
                                     \ start='^\.\. \[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]\s'
@@ -69,7 +69,7 @@ syn match       rstHyperlinksLabel  '\w\+__\=\>'
 
 syn match       rstInternalTarget   '_`\S\%([^`]*\S\)\=`'
 
-syn match       rstListItem         '^:\%(\w\+\s*\)\+:'
+syn match       rstListItem         '^:\w\+\%(\s\+\w\+\)*:'
 syn match       rstListItem         '^\s*[-*+]\s\+'
 
 syn sync minlines=50