updated for version 7.0g01

5 files changed, 73 insertions, 65 deletions

diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 3b0536aa3b..a39fbd80e2 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:	2006 Apr 24
+" Last Change:	2006 May 01
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -289,8 +289,8 @@ syn match	cUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 syn match	cUserLabel	display "\I\i*" contained
 
 " Avoid recognizing most bitfields as labels
-syn match	cBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1
-syn match	cBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1
+syn match	cBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
 
 if exists("c_minlines")
   let b:c_minlines = c_minlines
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 3e26b4c5cb..f15e83cb61 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:	Debian control files
-" Maintainer:	Gerfried Fuchs <alfie@debian.org>
-" Last Change:  29 Oct 2004
-" URL:          http://alfie.ist.org/software/vim/syntax/debcontrol.vim
-"
-" Original Version: Wichert Akkerman <wakkerma@debian.org>
+" Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
+" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+"                     Wichert Akkerman <wakkerma@debian.org>
+" Last Change: $LastChangedDate: 2006-04-16 21:50:31 -0400 (Sun, 16 Apr 2006) $
+" URL: http://svn.debian.org/wsvn/pkg-vim/trunk/runtime/syntax/debcontrol.vim?op=file&rev=0&sc=0
 
 " Comments are very welcome - but please make sure that you are commenting on
 " the latest version of this file.
@@ -25,7 +25,7 @@ syn match debControlComma ", *"
 syn match debControlSpace " "
 
 " Define some common expressions we can use later on
-syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\|hppa\|i386\|ia64\|m68k\|mipsel\|mips\|powerpc\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-i386\|knetbsd-i386\|netbsd-i386\)"
+syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(eb\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
 syn match debcontrolName contained "[a-z][a-z0-9+-]*"
 syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
 syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"
diff --git a/runtime/syntax/sisu.vim b/runtime/syntax/sisu.vim
index bfc11bb0a1..f10182c901 100644
--- a/runtime/syntax/sisu.vim
+++ b/runtime/syntax/sisu.vim
@@ -22,7 +22,7 @@ if !exists("sisu_no_identifiers")
   syn match   sisu_control                           "\""
   syn match   sisu_underline                         "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
   syn match   sisu_number        contains=@NoSpell   "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
-  syn match   sisu_link          contains=@NoSpell   "\(http://\|\.\.\/\)\S\+"
+  syn match   sisu_link          contains=@NoSpell   "\(https\?://\|\.\.\/\)\S\+"
   "metaverse specific
   syn match   sisu_ocn           contains=@NoSpell   "<\~\d\+;\w\d\+;\w\d\+>"
   syn match   sisu_marktail                          "<\~#>"
@@ -57,7 +57,7 @@ syn region sisu_content_alt contains=sisu_error matchgroup=sisu_contain start="^
 syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\~{" end="}\~" skip="\n"
 syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n\n"
 "%   images
-syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}\(\(http://\|\.\./\)\S\+\|image\)" oneline
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}\(\(https\?://\|\.\./\)\S\+\|image\)" oneline
 "%   some line operations
 syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$"
 syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([12*]\|[12]\*\) " end="$"
@@ -103,9 +103,9 @@ syn region  sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin"
 syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+"
 syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
 syn match sisu_error_wspace contains=sisu_error_wspace  " \s*$"
-syn match sisu_error contains=sisu_error,sisu_error_wspace "[^ (}]http:\S\+"
+syn match sisu_error contains=sisu_error,sisu_error_wspace "[^ (}]https\?:\S\+"
 syn match sisu_error contains=sisu_error_wspace "\t\+"
-syn match sisu_error contains=sisu_error "http:\S\+[}><]"
+syn match sisu_error contains=sisu_error "https\?:\S\+[}><]"
 syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n\n"
 syn match sisu_error contains=sisu_error "^[\-\~]{[^{]\{-}\n\n"
 syn match sisu_error contains=sisu_error "\s\+.{{"
@@ -125,8 +125,8 @@ syn match sisu_error  "/\?<\([biu]\)>[^(</\1>)]\{-}\n\n"
 syn match sisu_control "\n\n" "contains=ALL
 syn match sisu_control " //"
 syn match sisu_error  "%{"
-syn match sisu_error "<br>http:\S\+\|http:\S\+<br>"
-syn match sisu_error "[><]http:\S\+\|http:\S\+[><]"
+syn match sisu_error "<br>https\?:\S\+\|https\?:\S\+<br>"
+syn match sisu_error "[><]https\?:\S\+\|https\?:\S\+[><]"
 "% 2 Definitions - Define the default highlighting.
 if version >= 508 || !exists("did_sisu_syntax_inits")
   if version < 508
diff --git a/runtime/syntax/snobol4.vim b/runtime/syntax/snobol4.vim
index d5475e5e78..1f6460f1fd 100644
--- a/runtime/syntax/snobol4.vim
+++ b/runtime/syntax/snobol4.vim
@@ -1,7 +1,10 @@
 " Vim syntax file
 " Language:     SNOBOL4
 " Maintainer:   Rafal Sulejman <rms@poczta.onet.pl>
-" Last change:  2004 May 16
+" Site: http://rms.republika.pl/vim/syntax/snobol4.vim
+" Last change:  2006 may 1
+" Changes: 
+" - nonexistent Snobol4 keywords displayed as errors.
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -13,48 +16,49 @@ endif
 
 syntax case ignore
 " Vanilla Snobol4 keywords
-syn keyword	snobol4Keywoard   any apply arb arbno arg array
-syn keyword	snobol4Keywoard   break
-syn keyword	snobol4Keywoard   char clear code collect convert copy
-syn keyword	snobol4Keywoard   data datatype date define detach differ dump dupl
-syn keyword	snobol4Keywoard   endfile eq eval
-syn keyword	snobol4Keywoard   field
-syn keyword	snobol4Keywoard   ge gt ident
-syn keyword	snobol4Keywoard   input integer item
-syn keyword	snobol4Keywoard   le len lgt local lpad lt
-syn keyword	snobol4Keywoard   ne notany
-syn keyword	snobol4Keywoard   opsyn output
-syn keyword	snobol4Keywoard   pos prototype
-syn keyword	snobol4Keywoard   remdr replace rpad rpos rtab
-syn keyword	snobol4Keywoard   size span stoptr
-syn keyword	snobol4Keywoard   tab table time trace trim
-syn keyword	snobol4Keywoard   unload
-syn keyword	snobol4Keywoard   value
+syn keyword     snobol4Keyword   any apply arb arbno arg array
+syn keyword     snobol4Keyword   break
+syn keyword     snobol4Keyword   char clear code collect convert copy
+syn keyword     snobol4Keyword   data datatype date define detach differ dump dupl
+syn keyword     snobol4Keyword   endfile eq eval
+syn keyword     snobol4Keyword   field
+syn keyword     snobol4Keyword   ge gt ident
+syn keyword     snobol4Keyword   input integer item
+syn keyword     snobol4Keyword   le len lgt local lpad lt
+syn keyword     snobol4Keyword   ne notany
+syn keyword     snobol4Keyword   opsyn output
+syn keyword     snobol4Keyword   pos prototype
+syn keyword     snobol4Keyword   remdr replace rpad rpos rtab
+syn keyword     snobol4Keyword   size span stoptr
+syn keyword     snobol4Keyword   tab table time trace trim terminal
+syn keyword     snobol4Keyword   unload
+syn keyword     snobol4Keyword   value
 " Spitbol keywords
 " CSNOBOL keywords
-syn keyword	snobol4Keywoard   sset
+syn keyword     snobol4Keyword   sset
 
 syn region      snobol4String       matchgroup=Quote start=+"+ skip=+\\"+ end=+"+
 syn region      snobol4String       matchgroup=Quote start=+'+ skip=+\\'+ end=+'+
-syn match       snobol4Label        "^[^- \t][^ \t]*"
 syn match       snobol4Statement    "^-[^ ][^ ]*"
-syn match       snobol4Comment      "^*.*$"
-syn match       Constant            "\.[a-z][a-z0-9\-]*"
-"syn match       snobol4Label        ":\([sf]*([^)]*)\)*" contains=ALLBUT,snobol4ParenError
-syn region       snobol4Label        start=":(" end=")" contains=ALLBUT,snobol4ParenError
-syn region       snobol4Label        start=":f(" end=")" contains=ALLBUT,snobol4ParenError
-syn region       snobol4Label        start=":s(" end=")" contains=ALLBUT,snobol4ParenError
-syn match       snobol4Number       "\<\d*\(\.\d\d*\)*\>"
+syn match       snobol4Comment      "^\*.*$"
+syn match       snobol4Comment      ";\*.*$"
+syn match       snobol4Constant     "[^a-z]\.[a-z][a-z0-9\-]*"
+syn region      snobol4Goto        start=":[sf]\{0,1}(" end=")\|$\|;" contains=ALLBUT,snobol4ParenError
+syn match       snobol4Number       "\<\d*\(\.\d\d*\)*\>" 
+syn match       snobol4BogusSysVar       "&\w\{1,}"
+syn match       snobol4SysVar       "&\(abort\|alphabet\|anchor\|arb\|bal\|case\|code\|dump\|errlimit\|errtext\|errtype\|fail\|fence\|fnclevel\|ftrace\|fullscan\|input\|lastno\|lcase\|maxlngth\|output\|parm\|rem\|rtntype\|stcount\|stfcount\|stlimit\|stno\|succeed\|trace\|trim\|ucase\)"
+syn match       snobol4Label        "^[^-\.\+ \t]\S\{1,}"
+"
 " Parens matching
 syn cluster     snobol4ParenGroup   contains=snobol4ParenError
 syn region      snobol4Paren        transparent start='(' end=')' contains=ALLBUT,@snobol4ParenGroup,snobol4ErrInBracket
 syn match       snobol4ParenError   display "[\])]"
 syn match       snobol4ErrInParen   display contained "[\]{}]\|<%\|%>"
 syn region      snobol4Bracket      transparent start='\[\|<:' end=']\|:>' contains=ALLBUT,@snobol4ParenGroup,snobol4ErrInParen
-syn match       snobol4ErrInBracket display contained "[);{}]\|<%\|%>"
+syn match       snobol4ErrInBracket display contained "[){}]\|<%\|%>"
 
 " optional shell shebang line
-syn match	snobol4Comment    "^\#\!.*$"
+syn match       snobol4Comment    "^\#\!.*$"
 
 
 " Define the default highlighting.
@@ -68,23 +72,27 @@ if version >= 508 || !exists("did_snobol4_syntax_inits")
     command -nargs=+ HiLink hi def link <args>
   endif
 
-  HiLink snobol4Label		Label
-  HiLink snobol4Conditional	Conditional
-  HiLink snobol4Repeat		Repeat
-  HiLink snobol4Number		Number
-  HiLink snobol4Error		Error
-  HiLink snobol4Statement	PreProc
-  HiLink snobol4String		String
-  HiLink snobol4Comment		Comment
-  HiLink snobol4Special		Special
-  HiLink snobol4Todo		Todo
-  HiLink snobol4Keyword		Statement
-  HiLink snobol4Function	Statement
-  HiLink snobol4Keyword		Keyword
-  HiLink snobol4MathsOperator	Operator
+  HiLink snobol4Constant        Constant
+  HiLink snobol4Label           Label
+  HiLink snobol4Goto            Repeat
+  HiLink snobol4Conditional     Conditional
+  HiLink snobol4Repeat          Repeat
+  HiLink snobol4Number          Number
+  HiLink snobol4Error           Error
+  HiLink snobol4Statement       PreProc
+  HiLink snobol4String          String
+  HiLink snobol4Comment         Comment
+  HiLink snobol4Special         Special
+  HiLink snobol4Todo            Todo
+  HiLink snobol4Keyword         Statement
+  HiLink snobol4Function        Statement
+  HiLink snobol4Keyword         Keyword
+  HiLink snobol4MathsOperator   Operator
   HiLink snobol4ParenError      snobol4Error
   HiLink snobol4ErrInParen      snobol4Error
   HiLink snobol4ErrInBracket    snobol4Error
+  HiLink snobol4SysVar          Keyword
+  HiLink snobol4BogusSysVar     snobol4Error
 
   delcommand HiLink
 endif
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 088e38c176..244e0b73e8 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 7.0 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 27, 2006
-" Version:	7.0-48
+" Last Change:	May 02, 2006
+" Version:	7.0-50
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -189,7 +189,7 @@ syn match vimEnvvar	"\${\I\i*}"
 " In-String Specials: {{{2
 " Try to catch strings, if nothing else matches (therefore it must precede the others!)
 "  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
-syn region vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\^\=\]\=" skip="\\\\\|\\\]" end="\]"me=e-1
+syn region vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
 syn match  vimPatSepErr	contained	"\\)"
 syn match  vimPatSep	contained	"\\|"
 syn region vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\]['"]"	contains=@vimStringGroup
@@ -308,10 +308,10 @@ syn match   vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
 syn case ignore
 syn match vimNotation	"\(\\\|<lt>\)\=<\([scam]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|space\|k\=\(page\)\=\(\|down\|up\)\)>" contains=vimBracket
 syn match vimNotation	"\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
-syn match vimNotation	"\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"	contains=vimBracket
-syn match vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1	contains=vimBracket
-syn match vimNotation	'\(\\\|<lt>\)\=<\(line[12]\|count\|bang\|reg\|args\|lt\|[qf]-args\)>'	contains=vimBracket
-syn match vimNotation	"\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"	contains=vimBracket
+syn match vimNotation	"\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"		contains=vimBracket
+syn match vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1			contains=vimBracket
+syn match vimNotation	'\(\\\|<lt>\)\=<\%(q-\)\=\(line[12]\|count\|bang\|reg\|args\|f-args\|lt\)>'	contains=vimBracket
+syn match vimNotation	"\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"		contains=vimBracket
 syn match vimBracket contained	"[\\<>]"
 syn case match