diff --git a/runtime/syntax/doxygen.vim b/runtime/syntax/doxygen.vim
index 1aea3bf..cadbf54 100644
--- a/runtime/syntax/doxygen.vim
+++ b/runtime/syntax/doxygen.vim
@@ -2,7 +2,7 @@
 " Language:     doxygen on top of c, cpp, idl, java, php
 " Maintainer:   Michael Geddes <vimmer@frog.wheelycreek.net>
 " Author:       Michael Geddes
-" Last Change:  Jan 2009
+" Last Change:  Jan 2009 (\tparam by Domnique Pelle, Aug 2013)
 " Version:      1.23
 "
 " Copyright 2004-2008 Michael Geddes
@@ -179,7 +179,7 @@
 
   " Match parameters and retvals (highlighting the first word as special).
   syn match doxygenParamDirection contained "\v\[(\s*in>((]\s*\[|\s*,\s*)out>)=|out>((]\s*\[|\s*,\s*)in>)=)\]" nextgroup=doxygenParamName skipwhite
-  syn keyword doxygenParam contained param nextgroup=doxygenParamName,doxygenParamDirection skipwhite
+  syn keyword doxygenParam contained param tparam nextgroup=doxygenParamName,doxygenParamDirection skipwhite
   syn match doxygenParamName contained +[A-Za-z0-9_:]\++ nextgroup=doxygenSpecialMultilineDesc skipwhite
   syn keyword doxygenRetval contained retval throw exception nextgroup=doxygenParamName skipwhite
 
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
index 5eb6144..02597e7 100644
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
-" Last Update:  2013-Jun-01
+" Last Update:  2013-Jul-25
 " License:      Vim license
 " URL:          https://github.com/hcs42/vim-erlang
 
@@ -36,6 +36,9 @@
     finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " Case sensitive
 syn case match
 
@@ -87,13 +90,13 @@
 syn match erlangBitType '\%(\/\%(\s\|\n\|%.*\n\)*\)\@<=\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\%(\%(\s\|\n\|%.*\n\)*-\%(\s\|\n\|%.*\n\)*\%(integer\|float\|binary\|bytes\|bitstring\|bits\|binary\|utf8\|utf16\|utf32\|signed\|unsigned\|big\|little\|native\|unit\)\)*' contains=erlangComment
 
 " Constants and Directives
-syn match erlangUnknownAttribute '-\%(\s\|\n\|%.*\n\)*\l[[:alnum:]_@]*' contains=erlangComment
-syn match erlangAttribute '-\%(\s\|\n\|%.*\n\)*\%(behaviou\=r\|compile\|export\|file\|import\|module\|author\|copyright\|doc\|vsn\|on_load\|export_type\)' contains=erlangComment
-syn match erlangInclude   '-\%(\s\|\n\|%.*\n\)*\%(include\|include_lib\)\>' contains=erlangComment
-syn match erlangRecordDef '-\%(\s\|\n\|%.*\n\)*record\>' contains=erlangComment
-syn match erlangDefine    '-\%(\s\|\n\|%.*\n\)*\%(define\|undef\)\>' contains=erlangComment
-syn match erlangPreCondit '-\%(\s\|\n\|%.*\n\)*\%(ifdef\|ifndef\|else\|endif\)\>' contains=erlangComment
-syn match erlangType      '-\%(\s\|\n\|%.*\n\)*\%(spec\|type\|opaque\|callback\)\>' contains=erlangComment
+syn match erlangUnknownAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\l[[:alnum:]_@]*' contains=erlangComment
+syn match erlangAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\%(behaviou\=r\|compile\|export\(_type\)\=\|file\|import\|module\|author\|copyright\|doc\|vsn\|on_load\)\>' contains=erlangComment
+syn match erlangInclude   '^\s*-\%(\s\|\n\|%.*\n\)*\%(include\|include_lib\)\>' contains=erlangComment
+syn match erlangRecordDef '^\s*-\%(\s\|\n\|%.*\n\)*record\>' contains=erlangComment
+syn match erlangDefine    '^\s*-\%(\s\|\n\|%.*\n\)*\%(define\|undef\)\>' contains=erlangComment
+syn match erlangPreCondit '^\s*-\%(\s\|\n\|%.*\n\)*\%(ifdef\|ifndef\|else\|endif\)\>' contains=erlangComment
+syn match erlangType      '^\s*-\%(\s\|\n\|%.*\n\)*\%(spec\|type\|opaque\|callback\)\>' contains=erlangComment
 
 " Keywords
 syn keyword erlangKeyword after begin case catch cond end fun if let of query
@@ -141,7 +144,8 @@
 " Define the default highlighting. See ":help group-name" for the groups and
 " their colors.
 
-let s:old_style = (exists("g:erlang_old_style_highlight") && g:erlang_old_style_highlight == 1)
+let s:old_style = (exists("g:erlang_old_style_highlight") &&
+                  \g:erlang_old_style_highlight == 1)
 
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -255,4 +259,7 @@
 
 let b:current_syntax = "erlang"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " vim: sw=2 et
diff --git a/runtime/syntax/lynx.vim b/runtime/syntax/lynx.vim
index 2e37ff6..fa7c26f 100644
--- a/runtime/syntax/lynx.vim
+++ b/runtime/syntax/lynx.vim
@@ -1,10 +1,9 @@
 " Vim syntax file
 " Language:	Lynx configuration file (lynx.cfg)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/lynx.vim
-" Last Change:	2007 Mar 20
+" Last Change:	2013 Jun 20
 
-" Lynx 2.8.5
+" Lynx 2.8.7
 
 if exists("b:current_syntax")
   finish
@@ -13,77 +12,124 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match   lynxLeadingWS  "^\s*" transparent nextgroup=lynxOption
+syn match lynxStart "^" transparent skipwhite nextgroup=lynxOption
 
-syn match   lynxComment    "\(^\|\s\+\)#.*$" contains=lynxTodo
+syn match lynxComment "\(^\|\s\+\)#.*$" contains=lynxTodo
 
-syn keyword lynxTodo	   TODO NOTE FIXME XXX contained
+syn keyword lynxTodo TODO NOTE FIXME XXX contained
 
-syn match   lynxDelimiter  ":" contained nextgroup=lynxBoolean,lynxNumber
+syn match lynxDelimiter ":" skipwhite nextgroup=lynxBoolean,lynxNumber,lynxNone,lynxRCOption
 
 syn case ignore
-syn keyword lynxBoolean    TRUE FALSE contained
+syn keyword lynxBoolean TRUE FALSE ON OFF contained
+syn keyword lynxNone    NONE		  contained
 syn case match
 
-syn match   lynxNumber	   "-\=\<\d\+\>" contained
+syn match lynxNumber "-\=\<\d\+\>" contained
 
+"{{{ Options
 syn case ignore
-syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS ALWAYS_RESUBMIT_POSTS ALWAYS_TRUSTED_EXEC ASSUME_CHARSET
-		     \ ASSUMED_COLOR ASSUMED_DOC_CHARSET_CHOICE ASSUME_LOCAL_CHARSET ASSUME_UNREC_CHARSET AUTO_UNCACHE_DIRLISTS
-		     \ BIBP_BIBHOST BIBP_GLOBAL_SERVER BLOCK_MULTI_BOOKMARKS BOLD_H1 BOLD_HEADERS
-		     \ BOLD_NAME_ANCHORS CASE_SENSITIVE_ALWAYS_ON CHARACTER_SET CHARSETS_DIRECTORY CHARSET_SWITCH_RULES
-		     \ CHECKMAIL COLLAPSE_BR_TAGS COLOR CONNECT_TIMEOUT COOKIE_ACCEPT_DOMAINS
-		     \ COOKIE_FILE COOKIE_LOOSE_INVALID_DOMAINS COOKIE_QUERY_INVALID_DOMAINS COOKIE_REJECT_DOMAINS COOKIE_SAVE_FILE
-		     \ COOKIE_STRICT_INVALID_DOMAINS CSO_PROXY CSWING_PATH DEBUGSECS DEFAULT_BOOKMARK_FILE
-		     \ DEFAULT_CACHE_SIZE DEFAULT_EDITOR DEFAULT_INDEX_FILE DEFAULT_KEYPAD_MODE DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS
-		     \ DEFAULT_USER_MODE DEFAULT_VIRTUAL_MEMORY_SIZE DIRED_MENU DISPLAY_CHARSET_CHOICE DOWNLOADER
-		     \ EMACS_KEYS_ALWAYS_ON ENABLE_LYNXRC ENABLE_SCROLLBACK EXTERNAL FINGER_PROXY
-		     \ FOCUS_WINDOW FORCE_8BIT_TOUPPER FORCE_COOKIE_PROMPT FORCE_EMPTY_HREFLESS_A FORCE_SSL_COOKIES_SECURE
-		     \ FORCE_SSL_PROMPT FORMS_OPTIONS FTP_PASSIVE FTP_PROXY GLOBAL_EXTENSION_MAP
-		     \ GLOBAL_MAILCAP GOPHER_PROXY GOTOBUFFER HELPFILE HIDDEN_LINK_MARKER
-		     \ HISTORICAL_COMMENTS HTMLSRC_ATTRNAME_XFORM HTMLSRC_TAGNAME_XFORM HTTP_PROXY HTTPS_PROXY
-		     \ INCLUDE INFOSECS JUMPBUFFER JUMPFILE JUMP_PROMPT
-		     \ JUSTIFY JUSTIFY_MAX_VOID_PERCENT KEYBOARD_LAYOUT KEYMAP LEFTARROW_IN_TEXTFIELD_PROMPT
-		     \ LIST_FORMAT LIST_NEWS_DATES LIST_NEWS_NUMBERS LOCAL_DOMAIN LOCALE_CHARSET
-		     \ LOCAL_EXECUTION_LINKS_ALWAYS_ON LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE LOCALHOST_ALIAS LYNXCGI_DOCUMENT_ROOT LYNXCGI_ENVIRONMENT
-		     \ LYNX_HOST_NAME LYNX_SIG_FILE MAIL_ADRS MAIL_SYSTEM_ERROR_LOGGING MAKE_LINKS_FOR_ALL_IMAGES
-		     \ MAKE_PSEUDO_ALTS_FOR_INLINES MESSAGESECS MINIMAL_COMMENTS MULTI_BOOKMARK_SUPPORT NCR_IN_BOOKMARKS
-		     \ NEWS_CHUNK_SIZE NEWS_MAX_CHUNK NEWS_POSTING NEWSPOST_PROXY NEWS_PROXY
-		     \ NEWSREPLY_PROXY NNTP_PROXY NNTPSERVER NO_DOT_FILES NO_FILE_REFERER
-		     \ NO_FORCED_CORE_DUMP NO_FROM_HEADER NO_ISMAP_IF_USEMAP NONRESTARTING_SIGWINCH NO_PROXY
-		     \ NO_REFERER_HEADER NO_TABLE_CENTER NUMBER_FIELDS_ON_LEFT NUMBER_LINKS_ON_LEFT OUTGOING_MAIL_CHARSET
-		     \ PARTIAL PARTIAL_THRES PERSISTENT_COOKIES PERSONAL_EXTENSION_MAP PERSONAL_MAILCAP
-		     \ PREFERRED_CHARSET PREFERRED_LANGUAGE PREPEND_BASE_TO_SOURCE PREPEND_CHARSET_TO_SOURCE PRETTYSRC
-		     \ PRETTYSRC_SPEC PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING PRINTER QUIT_DEFAULT_YES REFERER_WITH_QUERY
-		     \ REPLAYSECS REUSE_TEMPFILES RULE RULESFILE SAVE_SPACE
-		     \ SCAN_FOR_BURIED_NEWS_REFS SCREEN_SIZE SCROLLBAR SCROLLBAR_ARROW SEEK_FRAG_AREA_IN_CUR
-		     \ SEEK_FRAG_MAP_IN_CUR SET_COOKIES SHOW_CURSOR SHOW_KB_NAME SHOW_KB_RATE
-		     \ SNEWSPOST_PROXY SNEWS_PROXY SNEWSREPLY_PROXY SOFT_DQUOTES SOURCE_CACHE
-		     \ SOURCE_CACHE_FOR_ABORTED STARTFILE STRIP_DOTDOT_URLS SUBSTITUTE_UNDERSCORES SUFFIX
-		     \ SUFFIX_ORDER SYSTEM_EDITOR SYSTEM_MAIL SYSTEM_MAIL_FLAGS TAGSOUP
-		     \ TEXTFIELDS_NEED_ACTIVATION TIMEOUT TRIM_INPUT_FIELDS TRUSTED_EXEC TRUSTED_LYNXCGI
-		     \ UNDERLINE_LINKS UPLOADER URL_DOMAIN_PREFIXES URL_DOMAIN_SUFFIXES USE_FIXED_RECORDS
-		     \ USE_MOUSE USE_SELECT_POPUPS VERBOSE_IMAGES VIEWER VI_KEYS_ALWAYS_ON
-		     \ WAIS_PROXY XLOADIMAGE_COMMAND contained nextgroup=lynxDelimiter
-syn keyword lynxOption BZIP2_PATH CHMOD_PATH COMPRESS_PATH COPY_PATH GZIP_PATH
-		     \ INSTALL_PATH MKDIR_PATH MV_PATH RLOGIN_PATH RMDIR_PATH
-		     \ RM_PATH TAR_PATH TELNET_PATH TN3270_PATH TOUCH_PATH
-		     \ UNCOMPRESS_PATH UNZIP_PATH UUDECODE_PATH ZCAT_PATH ZIP_PATH contained nextgroup=lynxDelimiter
+syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS ALWAYS_RESUBMIT_POSTS
+	\ ALWAYS_TRUSTED_EXEC ANONFTP_PASSWORD ASSUMED_COLOR
+	\ ASSUMED_DOC_CHARSET_CHOICE ASSUME_CHARSET ASSUME_LOCAL_CHARSET
+	\ ASSUME_UNREC_CHARSET AUTO_SESSION AUTO_UNCACHE_DIRLISTS BAD_HTML
+	\ BIBP_BIBHOST BIBP_GLOBAL_SERVER BLOCK_MULTI_BOOKMARKS BOLD_H1
+	\ BOLD_HEADERS BOLD_NAME_ANCHORS BOOKMARK_FILE BROKEN_FTP_EPSV
+	\ BROKEN_FTP_RETR BZIP2_PATH CASE_SENSITIVE_ALWAYS_ON
+	\ CASE_SENSITIVE_SEARCHING CHARACTER_SET CHARSETS_DIRECTORY
+	\ CHARSET_SWITCH_RULES CHECKMAIL CHMOD_PATH COLLAPSE_BR_TAGS COLOR
+	\ COLOR_STYLE COMPRESS_PATH CONNECT_TIMEOUT COOKIE_ACCEPT_DOMAINS
+	\ COOKIE_FILE COOKIE_LOOSE_INVALID_DOMAINS
+	\ COOKIE_QUERY_INVALID_DOMAINS COOKIE_REJECT_DOMAINS COOKIE_SAVE_FILE
+	\ COOKIE_STRICT_INVALID_DOMAINS COPY_PATH CSO_PROXY CSWING_PATH
+	\ DEBUGSECS DEFAULT_BOOKMARK_FILE DEFAULT_CACHE_SIZE DEFAULT_COLORS
+	\ DEFAULT_EDITOR DEFAULT_INDEX_FILE DEFAULT_KEYPAD_MODE
+	\ DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS DEFAULT_USER_MODE
+	\ DEFAULT_VIRTUAL_MEMORY_SIZE DELAYSECS DIRED_MENU DIR_LIST_ORDER
+	\ DIR_LIST_STYLE DISPLAY DISPLAY_CHARSET_CHOICE DOWNLOADER EMACS_KEYS
+	\ EMACS_KEYS_ALWAYS_ON ENABLE_LYNXRC ENABLE_SCROLLBACK EXTERNAL
+	\ FILE_EDITOR FILE_SORTING_METHOD FINGER_PROXY FOCUS_WINDOW
+	\ FORCE_8BIT_TOUPPER FORCE_COOKIE_PROMPT FORCE_EMPTY_HREFLESS_A
+	\ FORCE_SSL_COOKIES_SECURE FORCE_SSL_PROMPT FORMS_OPTIONS FTP_FORMAT
+	\ FTP_PASSIVE FTP_PROXY GLOBAL_EXTENSION_MAP GLOBAL_MAILCAP
+	\ GOPHER_PROXY GOTOBUFFER GZIP_PATH HELPFILE HIDDEN_LINK_MARKER
+	\ HISTORICAL_COMMENTS HTMLSRC_ATTRNAME_XFORM HTMLSRC_TAGNAME_XFORM
+	\ HTTPS_PROXY HTTP_PROXY INCLUDE INFLATE_PATH INFOSECS INSTALL_PATH
+	\ JUMPBUFFER JUMPFILE JUMP_PROMPT JUSTIFY JUSTIFY_MAX_VOID_PERCENT
+	\ KBLAYOUT KEYBOARD_LAYOUT KEYMAP KEYPAD_MODE
+	\ LEFTARROW_IN_TEXTFIELD_PROMPT LINEEDIT_MODE LIST_FORMAT
+	\ LIST_NEWS_DATES LIST_NEWS_NUMBERS LOCALE_CHARSET LOCALHOST_ALIAS
+	\ LOCAL_DOMAIN LOCAL_EXECUTION_LINKS_ALWAYS_ON
+	\ LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE LYNXCGI_DOCUMENT_ROOT
+	\ LYNXCGI_ENVIRONMENT LYNX_HOST_NAME LYNX_SIG_FILE MAIL_ADRS
+	\ MAIL_SYSTEM_ERROR_LOGGING MAKE_LINKS_FOR_ALL_IMAGES
+	\ MAKE_PSEUDO_ALTS_FOR_INLINES MAX_COOKIES_BUFFER MAX_COOKIES_DOMAIN
+	\ MAX_COOKIES_GLOBAL MESSAGESECS MINIMAL_COMMENTS MKDIR_PATH
+	\ MULTI_BOOKMARK MULTI_BOOKMARK_SUPPORT MV_PATH NCR_IN_BOOKMARKS
+	\ NESTED_TABLES NEWSPOST_PROXY NEWSREPLY_PROXY NEWS_CHUNK_SIZE
+	\ NEWS_MAX_CHUNK NEWS_POSTING NEWS_PROXY NNTPSERVER NNTP_PROXY
+	\ NONRESTARTING_SIGWINCH NO_DOT_FILES NO_FILE_REFERER
+	\ NO_FORCED_CORE_DUMP NO_FROM_HEADER NO_ISMAP_IF_USEMAP NO_MARGINS
+	\ NO_PAUSE NO_PROXY NO_REFERER_HEADER NO_TABLE_CENTER NO_TITLE
+	\ NUMBER_FIELDS_ON_LEFT NUMBER_LINKS_ON_LEFT OUTGOING_MAIL_CHARSET
+	\ PARTIAL PARTIAL_THRES PERSISTENT_COOKIES PERSONAL_EXTENSION_MAP
+	\ PERSONAL_MAILCAP PERSONAL_MAIL_ADDRESS POSITIONABLE_EDITOR
+	\ PREFERRED_CHARSET PREFERRED_ENCODING PREFERRED_LANGUAGE
+	\ PREFERRED_MEDIA_TYPES PREPEND_BASE_TO_SOURCE
+	\ PREPEND_CHARSET_TO_SOURCE PRETTYSRC PRETTYSRC_SPEC
+	\ PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING PRINTER QUIT_DEFAULT_YES RAW_MODE
+	\ READ_TIMEOUT REFERER_WITH_QUERY REPLAYSECS REUSE_TEMPFILES
+	\ RLOGIN_PATH RM_PATH RMDIR_PATH RULE RULESFILE
+	\ RUN_ALL_EXECUTION_LINKS RUN_EXECUTION_LINKS_LOCAL SAVE_SPACE
+	\ SCAN_FOR_BURIED_NEWS_REFS SCREEN_SIZE SCROLLBAR SCROLLBAR_ARROW
+	\ SEEK_FRAG_AREA_IN_CUR SEEK_FRAG_MAP_IN_CUR SELECT_POPUPS
+	\ SEND_USERAGENT SESSION_FILE SESSION_LIMIT SET_COOKIES SETFONT_PATH
+	\ SHOW_COLOR SHOW_CURSOR SHOW_DOTFILES SHOW_KB_NAME SHOW_KB_RATE
+	\ SNEWSPOST_PROXY SNEWSREPLY_PROXY SNEWS_PROXY SOFT_DQUOTES
+	\ SOURCE_CACHE SOURCE_CACHE_FOR_ABORTED SSL_CERT_FILE STARTFILE
+	\ STATUS_BUFFER_SIZE STRIP_DOTDOT_URLS SUBSTITUTE_UNDERSCORES
+	\ SUB_BOOKMARKS SUFFIX SUFFIX_ORDER SYSLOG_REQUESTED_URLS SYSLOG_TEXT
+	\ SYSTEM_EDITOR SYSTEM_MAIL SYSTEM_MAIL_FLAGS TAGSOUP TAR_PATH
+	\ TELNET_PATH TEXTFIELDS_NEED_ACTIVATION TIMEOUT TN3270_PATH
+	\ TOUCH_PATH TRIM_INPUT_FIELDS TRUSTED_EXEC TRUSTED_LYNXCGI
+	\ UNCOMPRESS_PATH UNDERLINE_LINKS UNZIP_PATH UPLOADER
+	\ URL_DOMAIN_PREFIXES URL_DOMAIN_SUFFIXES USERAGENT USER_MODE
+	\ USE_FIXED_RECORDS USE_MOUSE USE_SELECT_POPUPS UUDECODE_PATH
+	\ VERBOSE_IMAGES VIEWER VISITED_LINKS VI_KEYS VI_KEYS_ALWAYS_ON
+	\ WAIS_PROXY XHTML_PARSING XLOADIMAGE_COMMAND ZCAT_PATH ZIP_PATH
+	\ contained nextgroup=lynxDelimiter
+syn keyword lynxRCOption accept_all_cookies assume_charset auto_session
+	\ bookmark_file case_sensitive_searching character_set
+	\ cookie_accept_domains cookie_file cookie_loose_invalid_domains
+	\ cookie_query_invalid_domains cookie_reject_domains
+	\ cookie_strict_invalid_domains dir_list_style display emacs_keys
+	\ file_editor file_sorting_method force_cookie_prompt force_ssl_prompt
+	\ ftp_passive kblayout keypad_mode lineedit_mode locale_charset
+	\ make_links_for_all_images make_pseudo_alts_for_inlines
+	\ multi_bookmark no_pause personal_mail_address preferred_charset
+	\ preferred_encoding preferred_language preferred_media_types raw_mode
+	\ run_all_execution_links run_execution_links_on_local_files scrollbar
+	\ select_popups send_useragent session_file set_cookies show_color
+	\ show_cursor show_dotfiles show_kb_rate sub_bookmarks tagsoup
+	\ underline_links user_mode useragent verbose_images vi_keys
+	\ visited_links
+	\ contained nextgroup=lynxDelimiter
 syn case match
+" }}}
 
-" NOTE: set this if you want the cfg2html.pl formatting directives to be highlighted
-if exists("lynx_formatting_directives")
-  syn match lynxFormatDir  "^\.\(h1\|h2\)\s.*$"
-  syn match lynxFormatDir  "^\.\(ex\|nf\)\(\s\+\d\+\)\=$"
-  syn match lynxFormatDir  "^\.fi$"
-endif
+" cfg2html.pl formatting directives
+syn match lynxFormatDir  "^\.h\d\s.*$"
+syn match lynxFormatDir  "^\.\(ex\|nf\)\(\s\+\d\+\)\=$"
+syn match lynxFormatDir  "^\.fi$"
 
 hi def link lynxBoolean		Boolean
 hi def link lynxComment		Comment
 hi def link lynxDelimiter	Special
 hi def link lynxFormatDir	Special
+hi def link lynxNone		Constant
 hi def link lynxNumber		Number
 hi def link lynxOption		Identifier
+hi def link lynxRCOption	lynxOption
 hi def link lynxTodo		Todo
 
 let b:current_syntax = "lynx"
@@ -91,4 +137,4 @@
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" vim: ts=8 fdm=marker:
diff --git a/runtime/syntax/mailcap.vim b/runtime/syntax/mailcap.vim
index 547db73..bd23040 100644
--- a/runtime/syntax/mailcap.vim
+++ b/runtime/syntax/mailcap.vim
@@ -1,54 +1,35 @@
 " Vim syntax file
 " Language:	Mailcap configuration file
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" Last Change:	2004 Nov 27
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/mailcap.vim
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 01
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-syn match  mailcapComment	"^#.*"
+syn match  mailcapComment "^#.*"
 
-syn region mailcapString	start=+"+ end=+"+ contains=mailcapSpecial oneline
+syn region mailcapString start=+"+ end=+"+ contains=mailcapSpecial oneline
 
-syn match  mailcapDelimiter	"\\\@<!;"
+syn match  mailcapDelimiter "\\\@<!;"
 
-syn match  mailcapSpecial	"\\\@<!%[nstF]"
-syn match  mailcapSpecial	"\\\@<!%{[^}]*}"
+syn match  mailcapSpecial "\\\@<!%[nstF]"
+syn match  mailcapSpecial "\\\@<!%{[^}]*}"
 
 syn case ignore
-syn match  mailcapFlag		"\(=\s*\)\@<!\<\(needsterminal\|copiousoutput\|x-\w\+\)\>"
-syn match  mailcapFieldname	"\<\(compose\|composetyped\|print\|edit\|test\|x11-bitmap\|nametemplate\|textualnewlines\|description\|x-\w+\)\>\ze\s*="
-syn match  mailcapTypeField	"^\(text\|image\|audio\|video\|application\|message\|multipart\|model\|x-[[:graph:]]\+\)\(/\(\*\|[[:graph:]]\+\)\)\=\ze\s*;"
+syn match  mailcapFlag	    "\(=\s*\)\@<!\<\(needsterminal\|copiousoutput\|x-\w\+\)\>"
+syn match  mailcapFieldname "\<\(compose\|composetyped\|print\|edit\|test\|x11-bitmap\|nametemplate\|textualnewlines\|description\|x-\w+\)\>\ze\s*="
+syn match  mailcapTypeField "^\(text\|image\|audio\|video\|application\|message\|multipart\|model\|x-[[:graph:]]\+\)\(/\(\*\|[[:graph:]]\+\)\)\=\ze\s*;"
 syn case match
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mailcap_syntax_inits")
-  if version < 508
-    let did_mailcap_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink mailcapComment		Comment
-  HiLink mailcapDelimiter	Delimiter
-  HiLink mailcapFlag		Statement
-  HiLink mailcapFieldname	Statement
-  HiLink mailcapSpecial		Identifier
-  HiLink mailcapTypeField	Type
-  HiLink mailcapString		String
-
-  delcommand HiLink
-endif
+hi def link mailcapComment	Comment
+hi def link mailcapDelimiter	Delimiter
+hi def link mailcapFlag		Statement
+hi def link mailcapFieldname	Statement
+hi def link mailcapSpecial	Identifier
+hi def link mailcapTypeField	Type
+hi def link mailcapString	String
 
 let b:current_syntax = "mailcap"
 
-" vim: tabstop=8
+" vim: ts=8
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim
index c7b8093..c09373a 100644
--- a/runtime/syntax/perl.vim
+++ b/runtime/syntax/perl.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl/tree/master
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-23
 " Contributors:  Andy Lester <andy@petdance.com>
 "                Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
 "                Lukas Mai <l.mai.web.de>
@@ -68,6 +68,7 @@
 
 syn cluster perlTop		contains=TOP
 
+syn region perlBraces start="{" end="}" transparent extend
 
 " All keywords
 "
@@ -416,8 +417,6 @@
     if exists("perl_fold_anonymous_subs") && perl_fold_anonymous_subs
       syn region perlSubFold     start="\<sub\>[^\n;]*{" end="}" transparent fold keepend extend
       syn region perlSubFold     start="\<\%(BEGIN\|END\|CHECK\|INIT\)\>\s*{" end="}" transparent fold keepend
-
-      syn region perlBraces start="{" end="}" transparent extend
     else
       syn region perlSubFold     start="^\z(\s*\)\<sub\>.*[^};]$" end="^\z1}\s*\%(#.*\)\=$" transparent fold keepend
       syn region perlSubFold start="^\z(\s*\)\<\%(BEGIN\|END\|CHECK\|INIT\|UNITCHECK\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
index 393b7af..3d82ced 100644
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -3,7 +3,7 @@
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl/tree/master
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-21
 
 " Contributors:  Luke Palmer <fibonaci@babylonia.flatirons.org>
 "                Moritz Lenz <moritz@faui2k3.org>
diff --git a/runtime/syntax/pod.vim b/runtime/syntax/pod.vim
index 50a4cf9..b9f2e08 100644
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -4,7 +4,7 @@
 " Previously:    Scott Bigham <dsb@killerbunnies.org>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-21
 
 " To add embedded POD documentation highlighting to your syntax file, add
 " the commands:
diff --git a/runtime/syntax/tidy.vim b/runtime/syntax/tidy.vim
index b23dc3a..c24796e 100644
--- a/runtime/syntax/tidy.vim
+++ b/runtime/syntax/tidy.vim
@@ -1,161 +1,144 @@
 " Vim syntax file
-" Language:	HMTL Tidy configuration file ( /etc/tidyrc ~/.tidyrc )
-" Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/tidy.vim
-" Last Change:	2005 Oct 06
+" Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 June 01
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-if version < 600
-  set iskeyword=@,48-57,-
-else
-  setlocal iskeyword=@,48-57,-
-endif
+setlocal iskeyword=@,48-57,-
 
-syn match	tidyComment		"^\s*//.*$" contains=tidyTodo
-syn match	tidyComment		"^\s*#.*$"  contains=tidyTodo
-syn keyword	tidyTodo		TODO NOTE FIXME XXX contained
+syn match	tidyComment	"^\s*//.*$" contains=tidyTodo
+syn match	tidyComment	"^\s*#.*$"  contains=tidyTodo
+syn keyword	tidyTodo	TODO NOTE FIXME XXX contained
 
-syn match	tidyAssignment		"^[a-z0-9-]\+:\s*.*$" contains=tidyOption,@tidyValue,tidyDelimiter
-syn match	tidyDelimiter		":" contained
+syn match	tidyAssignment	"^[a-z0-9-]\+:\s*.*$" contains=tidyOption,@tidyValue,tidyDelimiter
+syn match	tidyDelimiter	":" contained
 
 syn match	tidyNewTagAssignment	"^new-\l\+-tags:\s*.*$" contains=tidyNewTagOption,tidyNewTagDelimiter,tidyNewTagValue,tidyDelimiter
 syn match	tidyNewTagDelimiter	"," contained
 syn match	tidyNewTagValue		"\<\w\+\>" contained
 
 syn case ignore
-syn keyword	tidyBoolean		t[rue] f[alse] y[es] n[o] contained
+syn keyword	tidyBoolean t[rue] f[alse] y[es] n[o] contained
 syn case match
-syn match	tidyDoctype		"\<omit\|auto\|strict\|loose\|transitional\|user\>" contained
+syn match	tidyDoctype "\<\%(omit\|auto\|strict\|loose\|transitional\|user\)\>" contained
 " NOTE: use match rather than keyword here so that tidyEncoding 'raw' does not
 "       always have precedence over tidyOption 'raw'
-syn match	tidyEncoding		"\<\(ascii\|latin0\|latin1\|raw\|utf8\|iso2022\|mac\|utf16le\|utf16be\|utf16\|win1252\|ibm858\|big5\|shiftjis\)\>" contained
-syn match	tidyNewline		"\<\(LF\|CRLF\|CR\)\>"
-syn match	tidyNumber		"\<\d\+\>" contained
-syn match	tidyRepeat		"\<keep-first\|keep-last\>" contained
-syn region	tidyString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
-syn region	tidyString		start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
-syn cluster	tidyValue		contains=tidyBoolean,tidyDoctype,tidyEncoding,tidyNewline,tidyNumber,tidyRepeat,tidyString
+syn match	tidyEncoding	"\<\%(ascii\|latin0\|latin1\|raw\|utf8\|iso2022\|mac\|utf16le\|utf16be\|utf16\|win1252\|ibm858\|big5\|shiftjis\)\>" contained
+syn match	tidyNewline	"\<\%(LF\|CRLF\|CR\)\>"
+syn match	tidyNumber	"\<\d\+\>" contained
+syn match	tidyRepeat	"\<\%(keep-first\|keep-last\)\>" contained
+syn region	tidyString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
+syn region	tidyString	start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
+syn cluster	tidyValue	contains=tidyBoolean,tidyDoctype,tidyEncoding,tidyNewline,tidyNumber,tidyRepeat,tidyString
 
-syn match	tidyOption		"^accessibility-check"		contained
-syn match	tidyOption		"^add-xml-decl"			contained
-syn match	tidyOption		"^add-xml-pi"			contained
-syn match	tidyOption		"^add-xml-space"		contained
-syn match	tidyOption		"^alt-text"			contained
-syn match	tidyOption		"^ascii-chars"			contained
-syn match	tidyOption		"^assume-xml-procins"		contained
-syn match	tidyOption		"^bare"				contained
-syn match	tidyOption		"^break-before-br"		contained
-syn match	tidyOption		"^char-encoding"		contained
-syn match	tidyOption		"^clean"			contained
-syn match	tidyOption		"^css-prefix"			contained
-syn match	tidyOption		"^doctype"			contained
-syn match	tidyOption		"^doctype-mode"			contained
-syn match	tidyOption		"^drop-empty-paras"		contained
-syn match	tidyOption		"^drop-font-tags"		contained
-syn match	tidyOption		"^drop-proprietary-attributes"	contained
-syn match	tidyOption		"^enclose-block-text"		contained
-syn match	tidyOption		"^enclose-text"			contained
-syn match	tidyOption		"^error-file"			contained
-syn match	tidyOption		"^escape-cdata"			contained
-syn match	tidyOption		"^fix-backslash"		contained
-syn match	tidyOption		"^fix-bad-comments"		contained
-syn match	tidyOption		"^fix-uri"			contained
-syn match	tidyOption		"^force-output"			contained
-syn match	tidyOption		"^gnu-emacs"			contained
-syn match	tidyOption		"^gnu-emacs-file"		contained
-syn match	tidyOption		"^hide-comments"		contained
-syn match	tidyOption		"^hide-endtags"			contained
-syn match	tidyOption		"^indent"			contained
-syn match	tidyOption		"^indent-attributes"		contained
-syn match	tidyOption		"^indent-cdata"			contained
-syn match	tidyOption		"^indent-spaces"		contained
-syn match	tidyOption		"^input-encoding"		contained
-syn match	tidyOption		"^input-xml"			contained
-syn match	tidyOption		"^join-classes"			contained
-syn match	tidyOption		"^join-styles"			contained
-syn match	tidyOption		"^keep-time"			contained
-syn match	tidyOption		"^language"			contained
-syn match	tidyOption		"^literal-attributes"		contained
-syn match	tidyOption		"^logical-emphasis"		contained
-syn match	tidyOption		"^lower-literals"		contained
-syn match	tidyOption		"^markup"			contained
-syn match	tidyOption		"^merge-divs"			contained
-syn match	tidyOption		"^ncr"				contained
-syn match	tidyOption		"^newline"			contained
-syn match	tidyOption		"^numeric-entities"		contained
-syn match	tidyOption		"^output-bom"			contained
-syn match	tidyOption		"^output-encoding"		contained
-syn match	tidyOption		"^output-file"			contained
-syn match	tidyOption		"^output-html"			contained
-syn match	tidyOption		"^output-xhtml"			contained
-syn match	tidyOption		"^output-xml"			contained
-syn match	tidyOption		"^punctuation-wrap"		contained
-syn match	tidyOption		"^quiet"			contained
-syn match	tidyOption		"^quote-ampersand"		contained
-syn match	tidyOption		"^quote-marks"			contained
-syn match	tidyOption		"^quote-nbsp"			contained
-syn match	tidyOption		"^raw"				contained
-syn match	tidyOption		"^repeated-attributes"		contained
-syn match	tidyOption		"^replace-color"		contained
-syn match	tidyOption		"^show-body-only"		contained
-syn match	tidyOption		"^show-errors"			contained
-syn match	tidyOption		"^show-warnings"		contained
-syn match	tidyOption		"^slide-style"			contained
-syn match	tidyOption		"^split"			contained
-syn match	tidyOption		"^tab-size"			contained
-syn match	tidyOption		"^tidy-mark"			contained
-syn match	tidyOption		"^uppercase-attributes"		contained
-syn match	tidyOption		"^uppercase-tags"		contained
-syn match	tidyOption		"^word-2000"			contained
-syn match	tidyOption		"^wrap"				contained
-syn match	tidyOption		"^wrap-asp"			contained
-syn match	tidyOption		"^wrap-attributes"		contained
-syn match	tidyOption		"^wrap-jste"			contained
-syn match	tidyOption		"^wrap-php"			contained
-syn match	tidyOption		"^wrap-script-literals"		contained
-syn match	tidyOption		"^wrap-sections"		contained
-syn match	tidyOption		"^write-back"			contained
-syn match	tidyOption		"^vertical-space"		contained
-syn match	tidyNewTagOption	"^new-blocklevel-tags"		contained
-syn match	tidyNewTagOption	"^new-empty-tags"		contained
-syn match	tidyNewTagOption	"^new-inline-tags"		contained
-syn match	tidyNewTagOption	"^new-pre-tags"			contained
+syn match tidyOption "^accessibility-check"		contained
+syn match tidyOption "^add-xml-decl"			contained
+syn match tidyOption "^add-xml-pi"			contained
+syn match tidyOption "^add-xml-space"			contained
+syn match tidyOption "^alt-text"			contained
+syn match tidyOption "^anchor-as-name"			contained
+syn match tidyOption "^ascii-chars"			contained
+syn match tidyOption "^assume-xml-procins"		contained
+syn match tidyOption "^bare"				contained
+syn match tidyOption "^break-before-br"			contained
+syn match tidyOption "^char-encoding"			contained
+syn match tidyOption "^clean"				contained
+syn match tidyOption "^css-prefix"			contained
+syn match tidyOption "^decorate-inferred-ul"		contained
+syn match tidyOption "^doctype"				contained
+syn match tidyOption "^doctype-mode"			contained
+syn match tidyOption "^drop-empty-paras"		contained
+syn match tidyOption "^drop-font-tags"			contained
+syn match tidyOption "^drop-proprietary-attributes"	contained
+syn match tidyOption "^enclose-block-text"		contained
+syn match tidyOption "^enclose-text"			contained
+syn match tidyOption "^error-file"			contained
+syn match tidyOption "^escape-cdata"			contained
+syn match tidyOption "^fix-backslash"			contained
+syn match tidyOption "^fix-bad-comments"		contained
+syn match tidyOption "^fix-uri"				contained
+syn match tidyOption "^force-output"			contained
+syn match tidyOption "^gnu-emacs"			contained
+syn match tidyOption "^gnu-emacs-file"			contained
+syn match tidyOption "^hide-comments"			contained
+syn match tidyOption "^hide-endtags"			contained
+syn match tidyOption "^indent"				contained
+syn match tidyOption "^indent-attributes"		contained
+syn match tidyOption "^indent-cdata"			contained
+syn match tidyOption "^indent-spaces"			contained
+syn match tidyOption "^input-encoding"			contained
+syn match tidyOption "^input-xml"			contained
+syn match tidyOption "^join-classes"			contained
+syn match tidyOption "^join-styles"			contained
+syn match tidyOption "^keep-time"			contained
+syn match tidyOption "^language"			contained
+syn match tidyOption "^literal-attributes"		contained
+syn match tidyOption "^logical-emphasis"		contained
+syn match tidyOption "^lower-literals"			contained
+syn match tidyOption "^markup"				contained
+syn match tidyOption "^merge-divs"			contained
+syn match tidyOption "^merge-spans"			contained
+syn match tidyOption "^ncr"				contained
+syn match tidyOption "^newline"				contained
+syn match tidyOption "^numeric-entities"		contained
+syn match tidyOption "^output-bom"			contained
+syn match tidyOption "^output-encoding"			contained
+syn match tidyOption "^output-file"			contained
+syn match tidyOption "^output-html"			contained
+syn match tidyOption "^output-xhtml"			contained
+syn match tidyOption "^output-xml"			contained
+syn match tidyOption "^preserve-entities"		contained
+syn match tidyOption "^punctuation-wrap"		contained
+syn match tidyOption "^quiet"				contained
+syn match tidyOption "^quote-ampersand"			contained
+syn match tidyOption "^quote-marks"			contained
+syn match tidyOption "^quote-nbsp"			contained
+syn match tidyOption "^raw"				contained
+syn match tidyOption "^repeated-attributes"		contained
+syn match tidyOption "^replace-color"			contained
+syn match tidyOption "^show-body-only"			contained
+syn match tidyOption "^show-errors"			contained
+syn match tidyOption "^show-warnings"			contained
+syn match tidyOption "^slide-style"			contained
+syn match tidyOption "^sort-attributes"			contained
+syn match tidyOption "^split"				contained
+syn match tidyOption "^tab-size"			contained
+syn match tidyOption "^tidy-mark"			contained
+syn match tidyOption "^uppercase-attributes"		contained
+syn match tidyOption "^uppercase-tags"			contained
+syn match tidyOption "^word-2000"			contained
+syn match tidyOption "^wrap"				contained
+syn match tidyOption "^wrap-asp"			contained
+syn match tidyOption "^wrap-attributes"			contained
+syn match tidyOption "^wrap-jste"			contained
+syn match tidyOption "^wrap-php"			contained
+syn match tidyOption "^wrap-script-literals"		contained
+syn match tidyOption "^wrap-sections"			contained
+syn match tidyOption "^write-back"			contained
+syn match tidyOption "^vertical-space"			contained
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tidy_syn_inits")
-  if version < 508
-    let did_tidy_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn match tidyNewTagOption "^new-blocklevel-tags"	contained
+syn match tidyNewTagOption "^new-empty-tags"		contained
+syn match tidyNewTagOption "^new-inline-tags"		contained
+syn match tidyNewTagOption "^new-pre-tags"		contained
 
-  HiLink tidyBoolean		Boolean
-  HiLink tidyComment		Comment
-  HiLink tidyDelimiter		Special
-  HiLink tidyDoctype		Constant
-  HiLink tidyEncoding		Constant
-  HiLink tidyNewline		Constant
-  HiLink tidyNewTagDelimiter	Special
-  HiLink tidyNewTagOption	Identifier
-  HiLink tidyNewTagValue	Constant
-  HiLink tidyNumber		Number
-  HiLink tidyOption		Identifier
-  HiLink tidyRepeat		Constant
-  HiLink tidyString		String
-  HiLink tidyTodo		Todo
-
-  delcommand HiLink
-endif
+hi def link tidyBoolean		Boolean
+hi def link tidyComment		Comment
+hi def link tidyDelimiter	Special
+hi def link tidyDoctype		Constant
+hi def link tidyEncoding	Constant
+hi def link tidyNewline		Constant
+hi def link tidyNewTagDelimiter	Special
+hi def link tidyNewTagOption	Identifier
+hi def link tidyNewTagValue	Constant
+hi def link tidyNumber		Number
+hi def link tidyOption		Identifier
+hi def link tidyRepeat		Constant
+hi def link tidyString		String
+hi def link tidyTodo		Todo
 
 let b:current_syntax = "tidy"
 
diff --git a/runtime/syntax/tt2.vim b/runtime/syntax/tt2.vim
index a1912cb..5321e27 100644
--- a/runtime/syntax/tt2.vim
+++ b/runtime/syntax/tt2.vim
@@ -3,7 +3,7 @@
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-21
 "
 " Instration:
 "   put tt2.vim and tt2html.vim in to your syntax diretory.
diff --git a/runtime/syntax/tt2html.vim b/runtime/syntax/tt2html.vim
index b8c8136..ac5744f 100644
--- a/runtime/syntax/tt2html.vim
+++ b/runtime/syntax/tt2html.vim
@@ -3,7 +3,7 @@
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-21
 
 if exists("b:current_syntax")
     finish
diff --git a/runtime/syntax/tt2js.vim b/runtime/syntax/tt2js.vim
index 15e56e7..350df57 100644
--- a/runtime/syntax/tt2js.vim
+++ b/runtime/syntax/tt2js.vim
@@ -3,7 +3,7 @@
 " Author:        Yates, Peter <pd.yates@gmail.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
 " Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   2013 Jul 24
+" Last Change:   2013-07-21
 
 if exists("b:current_syntax")
     finish
diff --git a/runtime/syntax/upstreamlog.vim b/runtime/syntax/upstreamlog.vim
index 343b4a2..1161ecf 100644
--- a/runtime/syntax/upstreamlog.vim
+++ b/runtime/syntax/upstreamlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing upstream.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-06-17
+" Latest Revision:      2013-07-26
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -18,17 +18,28 @@
 " Processes:
 syn region upstreamlog_Process start="(" end=")" contained
 " IP Address:
-syn match upstreamlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match upstreamlog_IPaddr /\( \|(\)\zs\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
 " Profile:
-syn region upstreamlog_Profile start="Profile name \zs" end="\"\S\{1,8}\""
-syn region upstreamlog_Profile start=" Profile: \zs" end="\S\{1,8}"
-syn region upstreamlog_Profile start="  Profile: \zs" end="\ze, "
-syn region upstreamlog_Profile start="Backup Profile: \zs" end="\ze Version date"
-syn region upstreamlog_Profile start="Full of \zs" end="\ze$"
-syn region upstreamlog_Profile start="Incr. of \zs" end="\ze$"
+syn match upstreamlog_Profile /Using default configuration for profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Now running profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /in profile set \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Migrate disk backup from profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Profileset=\zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /Vault \(disk\|tape\) backup to vault \d\{1,4} from profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match upstreamlog_Profile / Profile: \zs\S\{1,8}/
+syn match upstreamlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match upstreamlog_Profile /, profile: \zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /found Profile: \zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /Backup Profile: \zs\ze Version date/
+syn match upstreamlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match upstreamlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match upstreamlog_Profile /Profile=\zs\S\{1,8}\ze,/
 " Target:
 syn region upstreamlog_Target start="Computer: \zs" end="\ze[\]\)]" 
 syn region upstreamlog_Target start="Computer name \zs" end="\ze," 
+syn region upstreamlog_Target start="request to registered name \zs" end=" "
+
 
 hi def link upstreamlog_Date	Underlined
 hi def link upstreamlog_MsgD	Type
diff --git a/runtime/syntax/usserverlog.vim b/runtime/syntax/usserverlog.vim
index 28105cc..7cd50b3 100644
--- a/runtime/syntax/usserverlog.vim
+++ b/runtime/syntax/usserverlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing usserver.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-06-17
+" Latest Revision:      2013-07-26
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -9,40 +9,51 @@
 endif
 
 " Date:
-syn match usserver_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+syn match usserverlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
 " Msg Types:
-syn match usserver_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usserver_Process skipwhite
-syn match usserver_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usserver_Process skipwhite
-syn match usserver_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usserver_Process skipwhite
-syn match usserver_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usserver_Process skipwhite
+syn match usserverlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usserverlog_Process skipwhite
 " Processes:
-syn region usserver_Process start="(" end=")" contained
+syn region usserverlog_Process start="(" end=")" contained
 " IP Address:
-syn match usserver_IPaddr /\( \|(\)\zs\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match usserverlog_IPaddr /\( \|(\)\zs\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
 " Profile:
-syn region usserver_Profile start="Profile name \zs" end="\"\S\{1,8}\""
-syn region usserver_Profile start=" Profile: \zs" end="\S\{1,8}"
-syn region usserver_Profile start=", profile: \zs" end="\S\{1,8}\ze,"
-syn region usserver_Profile start=" profile \zs" end="\S\{1,8}"
-syn region usserver_Profile start="  Profile: \zs" end="\ze, "
-syn region usserver_Profile start="Backup Profile: \zs" end="\ze Version date"
-syn region usserver_Profile start="Full of \zs" end="\ze$"
-syn region usserver_Profile start="Incr. of \zs" end="\ze$"
-syn region usserver_Profile start="Profile=\zs" end="\S\{1,8}\ze,"
+syn match usserverlog_Profile /Using default configuration for profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Now running profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /in profile set \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Migrate disk backup from profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Using profile prefix for profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Add\/update profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Profileset=\zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /profileset=\zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Vault \(disk\|tape\) backup to vault \d\{1,4} from profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match usserverlog_Profile / Profile: \zs\S\{1,8}/
+syn match usserverlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match usserverlog_Profile /, profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /Expecting Profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /found Profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /Profile \zs\S\{1,8} \zeis a member of group: /
+syn match usserverlog_Profile /Backup Profile: \zs\ze Version date/
+syn match usserverlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match usserverlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match usserverlog_Profile /Profile=\zs\S\{1,8}\ze,/
 " Target:
-syn region usserver_Target start="Computer: \zs" end="\ze[\]\)]" 
-syn region usserver_Target start="Computer name \zs" end="\ze," 
-syn region usserver_Target start="Registration add request successful \zs" end="$"
-syn region usserver_Target start="request to registered name \zs" end=" "
-syn region usserver_Target start=", sending to \zs" end="$"
+syn region usserverlog_Target start="Computer: \zs" end="\ze[\]\)]" 
+syn region usserverlog_Target start="Computer name \zs" end="\ze," 
+syn region usserverlog_Target start="Registration add request successful \zs" end="$"
+syn region usserverlog_Target start="request to registered name \zs" end=" "
+syn region usserverlog_Target start=", sending to \zs" end="$"
 
-hi def link usserver_Date	Underlined
-hi def link usserver_MsgD	Type
-hi def link usserver_MsgE	Error
-hi def link usserver_MsgW	Constant
-hi def link usserver_Process	Statement
-hi def link usserver_IPaddr	Identifier
-hi def link usserver_Profile	Identifier
-hi def link usserver_Target	Identifier
+hi def link usserverlog_Date	Underlined
+hi def link usserverlog_MsgD	Type
+hi def link usserverlog_MsgE	Error
+hi def link usserverlog_MsgW	Constant
+hi def link usserverlog_Process	Statement
+hi def link usserverlog_IPaddr	Identifier
+hi def link usserverlog_Profile	Identifier
+hi def link usserverlog_Target	Identifier
 
-let b:current_syntax = "usserver"
+let b:current_syntax = "usserverlog"
diff --git a/runtime/syntax/usw2kagtlog.vim b/runtime/syntax/usw2kagtlog.vim
index b241f16..9315731 100644
--- a/runtime/syntax/usw2kagtlog.vim
+++ b/runtime/syntax/usw2kagtlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing USW2KAgt.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-06-17
+" Latest Revision:      2013-07-26
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -9,40 +9,41 @@
 endif
 
 " Date:
-syn match usw2kagentlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+syn match usw2kagtlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
 " Msg Types:
-syn match usw2kagentlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usw2kagentlog_Process skipwhite
-syn match usw2kagentlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usw2kagentlog_Process skipwhite
-syn match usw2kagentlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usw2kagentlog_Process skipwhite
-syn match usw2kagentlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usw2kagentlog_Process skipwhite
+syn match usw2kagtlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usw2kagtlog_Process skipwhite
 " Processes:
-syn region usw2kagentlog_Process start="(" end=")" contained
-syn region usw2kagentlog_Process start="Starting the processing for a \zs\"" end="\ze client request"
-syn region usw2kagentlog_Process start="Ending the processing for a \zs\"" end="\ze client request"
+syn region usw2kagtlog_Process start="(" end=")" contained
+syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client request"
+syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client request"
 " IP Address:
-syn match usw2kagentlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match usw2kagtlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
 " Profile:
-syn region usw2kagentlog_Profile start="Profile name \zs" end="\"\S\{1,8}\""
-syn region usw2kagentlog_Profile start=" Profile: \zs" end="\S\{1,8}"
-syn region usw2kagentlog_Profile start="  Profile: \zs" end="\ze, "
-syn region usw2kagentlog_Profile start="Backup Profile: \zs" end="\ze Version date"
-syn region usw2kagentlog_Profile start="Full of \zs" end="\ze$"
-syn region usw2kagentlog_Profile start="Incr. of \zs" end="\ze$"
-syn region usw2kagentlog_Profile start="profile name \zs\"" end="\""
-" Target:
-syn region usw2kagentlog_Target start="Computer: \zs" end="\ze[\]\)]" 
-syn region usw2kagentlog_Target start="Computer name \zs" end="\ze," 
-" Agent Keywords:
-syn keyword usw2kagentlog_Agentword opened closed
 
-hi def link usw2kagentlog_Date		Underlined
-hi def link usw2kagentlog_MsgD		Type
-hi def link usw2kagentlog_MsgE		Error
-hi def link usw2kagentlog_MsgW		Constant
-hi def link usw2kagentlog_Process	Statement
-hi def link usw2kagentlog_IPaddr	Identifier
-hi def link usw2kagentlog_Profile	Identifier
-hi def link usw2kagentlog_Target	Identifier
-hi def link usw2kagentlog_Agentword	Special
+syn match usw2kagtlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match usw2kagtlog_Profile / Profile: \zs\S\{1,8}/
+syn match usw2kagtlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match usw2kagtlog_Profile /Backup Profile: \zs\ze Version date/
+syn match usw2kagtlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match usw2kagtlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match usw2kagtlog_Profile /profile name "\zs\S\{1,8}\ze"/
+" Target:
+syn region usw2kagtlog_Target start="Computer: \zs" end="\ze[\]\)]" 
+syn region usw2kagtlog_Target start="Computer name \zs" end="\ze," 
+" Agent Keywords:
+syn keyword usw2kagtlog_Agentword opened closed
+
+hi def link usw2kagtlog_Date		Underlined
+hi def link usw2kagtlog_MsgD		Type
+hi def link usw2kagtlog_MsgE		Error
+hi def link usw2kagtlog_MsgW		Constant
+hi def link usw2kagtlog_Process		Statement
+hi def link usw2kagtlog_IPaddr		Identifier
+hi def link usw2kagtlog_Profile		Identifier
+hi def link usw2kagtlog_Target		Identifier
+hi def link usw2kagtlog_Agentword	Special
 
 let b:current_syntax = "usw2kagentlog"
diff --git a/runtime/syntax/wget.vim b/runtime/syntax/wget.vim
index de8f558..2587022 100644
--- a/runtime/syntax/wget.vim
+++ b/runtime/syntax/wget.vim
@@ -1,194 +1,189 @@
-" Wget syntax file
-" Filename:     wget.vim
-" Language:     Wget configuration file ( /etc/wgetrc ~/.wgetrc )
-" Maintainer:   Doug Kearns <djkea2@gus.gscit.monash.edu.au>
-" URL:          http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/wget.vim
-" Last Change:  2005 Jul 24
+" Vim syntax file
+" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 1
 
-" TODO: all commands are actually underscore and hyphen insensitive, though
-"       they are normally named as listed below
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-syn match   wgetComment "^\s*#.*$" contains=wgetTodo
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match wgetComment "#.*$" contains=wgetTodo contained
 
 syn keyword wgetTodo TODO NOTE FIXME XXX contained
 
-syn match   wgetAssignment "^\s*[A-Za-z0-9_-]\+\s*=\s*.*$" contains=wgetCommand,wgetAssignmentOperator,wgetString,wgetBoolean,wgetNumber,wgetValue,wgetQuota,wgetRestriction,wgetTime
-
-syn match   wgetAssignmentOperator "=" contained
-
-syn region  wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
-syn region  wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
-
-" Note: make this a match so that always_rest matches properly
-syn case ignore
-syn match   wgetBoolean	"\<on\|off\|always\|never\|1\|0\>" contained
-syn case match
-
-syn match   wgetNumber	"\<\d\+\|inf\>"		contained
-syn match   wgetQuota	"\<\d\+[kKmM]\?\>"	contained
-syn match   wgetTime	"\<\d\+[smhdw]\>"	contained
+syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
+syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
 
 syn case ignore
-syn keyword wgetValue	default binary mega giga micro contained
+syn keyword wgetBoolean on off contained
+syn keyword wgetNumber  inf    contained
 syn case match
 
-syn match   wgetRestriction  "\<\%(windows\|unix\)\%(,nocontrol\)\=\>"	contained
-syn match   wgetRestriction  "\<nocontrol\>"				contained
+syn match wgetNumber "\<\%(\d\+\|inf\)\>" contained
+syn match wgetQuota  "\<\d\+[kKmM]\>"     contained
+syn match wgetTime   "\<\d\+[smhdw]\>"    contained
+
+"{{{ Commands
+let s:commands = map([
+        \ "accept",
+	\ "add_hostdir",
+	\ "adjust_extension",
+	\ "always_rest",
+	\ "ask_password",
+	\ "auth_no_challenge",
+	\ "background",
+	\ "backup_converted",
+	\ "backups",
+	\ "base",
+	\ "bind_address",
+	\ "ca_certificate",
+	\ "ca_directory",
+	\ "cache",
+	\ "certificate",
+	\ "certificate_type",
+	\ "check_certificate",
+	\ "connect_timeout",
+	\ "content_disposition",
+	\ "continue",
+	\ "convert_links",
+	\ "cookies",
+	\ "cut_dirs",
+	\ "debug",
+	\ "default_page",
+	\ "delete_after",
+	\ "dns_cache",
+	\ "dns_timeout",
+	\ "dir_prefix",
+	\ "dir_struct",
+	\ "domains",
+	\ "dot_bytes",
+	\ "dots_in_line",
+	\ "dot_spacing",
+	\ "dot_style",
+	\ "egd_file",
+	\ "exclude_directories",
+	\ "exclude_domains",
+	\ "follow_ftp",
+	\ "follow_tags",
+	\ "force_html",
+	\ "ftp_passwd",
+	\ "ftp_password",
+	\ "ftp_user",
+	\ "ftp_proxy",
+	\ "glob",
+	\ "header",
+	\ "html_extension",
+	\ "htmlify",
+	\ "http_keep_alive",
+	\ "http_passwd",
+	\ "http_password",
+	\ "http_proxy",
+	\ "https_proxy",
+	\ "http_user",
+	\ "ignore_case",
+	\ "ignore_length",
+	\ "ignore_tags",
+	\ "include_directories",
+	\ "inet4_only",
+	\ "inet6_only",
+	\ "input",
+	\ "iri",
+	\ "keep_session_cookies",
+	\ "kill_longer",
+	\ "limit_rate",
+	\ "load_cookies",
+	\ "locale",
+	\ "local_encoding",
+	\ "logfile",
+	\ "login",
+	\ "max_redirect",
+	\ "mirror",
+	\ "netrc",
+	\ "no_clobber",
+	\ "no_parent",
+	\ "no_proxy",
+	\ "numtries",
+	\ "output_document",
+	\ "page_requisites",
+	\ "passive_ftp",
+	\ "passwd",
+	\ "password",
+	\ "post_data",
+	\ "post_file",
+	\ "prefer_family",
+	\ "preserve_permissions",
+	\ "private_key",
+	\ "private_key_type",
+	\ "progress",
+	\ "protocol_directories",
+	\ "proxy_passwd",
+	\ "proxy_password",
+	\ "proxy_user",
+	\ "quiet",
+	\ "quota",
+	\ "random_file",
+	\ "random_wait",
+	\ "read_timeout",
+	\ "reclevel",
+	\ "recursive",
+	\ "referer",
+	\ "reject",
+	\ "relative_only",
+	\ "remote_encoding",
+	\ "remove_listing",
+	\ "restrict_file_names",
+	\ "retr_symlinks",
+	\ "retry_connrefused",
+	\ "robots",
+	\ "save_cookies",
+	\ "save_headers",
+	\ "secure_protocol",
+	\ "server_response",
+	\ "show_all_dns_entries",
+	\ "simple_host_check",
+	\ "span_hosts",
+	\ "spider",
+	\ "strict_comments",
+	\ "sslcertfile",
+	\ "sslcertkey",
+	\ "timeout",
+	\ "time_stamping",
+	\ "use_server_timestamps",
+	\ "tries",
+	\ "trust_server_names",
+	\ "user",
+	\ "use_proxy",
+	\ "user_agent",
+	\ "verbose",
+	\ "wait",
+	\ "wait_retry"],
+	\ "substitute(v:val, '_', '[-_]\\\\=', 'g')")
+"}}}
 
 syn case ignore
-syn match wgetCommand "^\s*accept" contained
-syn match wgetCommand "^\s*add[-_]\=hostdir" contained
-syn match wgetCommand "^\s*always[-_]\=rest" contained
-syn match wgetCommand "^\s*background" contained
-syn match wgetCommand "^\s*backup[-_]\=converted" contained
-syn match wgetCommand "^\s*backups" contained
-syn match wgetCommand "^\s*base" contained
-syn match wgetCommand "^\s*bind[-_]\=address" contained
-syn match wgetCommand "^\s*ca[-_]\=certificate" contained
-syn match wgetCommand "^\s*ca[-_]\=directory" contained
-syn match wgetCommand "^\s*cache" contained
-syn match wgetCommand "^\s*certificate" contained
-syn match wgetCommand "^\s*certificate[-_]\=type" contained
-syn match wgetCommand "^\s*check[-_]\=certificate" contained
-syn match wgetCommand "^\s*connect[-_]\=timeout" contained
-syn match wgetCommand "^\s*continue" contained
-syn match wgetCommand "^\s*convert[-_]\=links" contained
-syn match wgetCommand "^\s*cookies" contained
-syn match wgetCommand "^\s*cut[-_]\=dirs" contained
-syn match wgetCommand "^\s*debug" contained
-syn match wgetCommand "^\s*delete[-_]\=after" contained
-syn match wgetCommand "^\s*dns[-_]\=cache" contained
-syn match wgetCommand "^\s*dns[-_]\=timeout" contained
-syn match wgetCommand "^\s*dir[-_]\=prefix" contained
-syn match wgetCommand "^\s*dir[-_]\=struct" contained
-syn match wgetCommand "^\s*domains" contained
-syn match wgetCommand "^\s*dot[-_]\=bytes" contained
-syn match wgetCommand "^\s*dots[-_]\=in[-_]\=line" contained
-syn match wgetCommand "^\s*dot[-_]\=spacing" contained
-syn match wgetCommand "^\s*dot[-_]\=style" contained
-syn match wgetCommand "^\s*egd[-_]\=file" contained
-syn match wgetCommand "^\s*exclude[-_]\=directories" contained
-syn match wgetCommand "^\s*exclude[-_]\=domains" contained
-syn match wgetCommand "^\s*follow[-_]\=ftp" contained
-syn match wgetCommand "^\s*follow[-_]\=tags" contained
-syn match wgetCommand "^\s*force[-_]\=html" contained
-syn match wgetCommand "^\s*ftp[-_]\=passw\(or\)\=d" contained
-syn match wgetCommand "^\s*ftp[-_]\=user" contained
-syn match wgetCommand "^\s*ftp[-_]\=proxy" contained
-syn match wgetCommand "^\s*glob" contained
-syn match wgetCommand "^\s*header" contained
-syn match wgetCommand "^\s*html[-_]\=extension" contained
-syn match wgetCommand "^\s*htmlify" contained
-syn match wgetCommand "^\s*http[-_]\=keep[-_]\=alive" contained
-syn match wgetCommand "^\s*http[-_]\=passwd" contained
-syn match wgetCommand "^\s*http[-_]\=password" contained
-syn match wgetCommand "^\s*http[-_]\=proxy" contained
-syn match wgetCommand "^\s*https[-_]\=proxy" contained
-syn match wgetCommand "^\s*http[-_]\=user" contained
-syn match wgetCommand "^\s*ignore[-_]\=length" contained
-syn match wgetCommand "^\s*ignore[-_]\=tags" contained
-syn match wgetCommand "^\s*include[-_]\=directories" contained
-syn match wgetCommand "^\s*inet4[-_]\=only" contained
-syn match wgetCommand "^\s*inet6[-_]\=only" contained
-syn match wgetCommand "^\s*input" contained
-syn match wgetCommand "^\s*keep[-_]\=session[-_]\=cookies" contained
-syn match wgetCommand "^\s*kill[-_]\=longer" contained
-syn match wgetCommand "^\s*limit[-_]\=rate" contained
-syn match wgetCommand "^\s*load[-_]\=cookies" contained
-syn match wgetCommand "^\s*logfile" contained
-syn match wgetCommand "^\s*login" contained
-syn match wgetCommand "^\s*mirror" contained
-syn match wgetCommand "^\s*netrc" contained
-syn match wgetCommand "^\s*no[-_]\=clobber" contained
-syn match wgetCommand "^\s*no[-_]\=parent" contained
-syn match wgetCommand "^\s*no[-_]\=proxy" contained
-" Note: this option is deprecated, use 'tries' instead
-syn match wgetCommand "^\s*numtries" contained
-syn match wgetCommand "^\s*output[-_]\=document" contained
-syn match wgetCommand "^\s*page[-_]\=requisites" contained
-syn match wgetCommand "^\s*passive[-_]\=ftp" contained
-syn match wgetCommand "^\s*passwd" contained
-syn match wgetCommand "^\s*password" contained
-syn match wgetCommand "^\s*post[-_]\=data" contained
-syn match wgetCommand "^\s*post[-_]\=file" contained
-syn match wgetCommand "^\s*prefer[-_]\=family" contained
-syn match wgetCommand "^\s*preserve[-_]\=permissions" contained
-syn match wgetCommand "^\s*private[-_]\=key" contained
-syn match wgetCommand "^\s*private[-_]\=key[-_]\=type" contained
-syn match wgetCommand "^\s*progress" contained
-syn match wgetCommand "^\s*protocol[-_]\=directories" contained
-syn match wgetCommand "^\s*proxy[-_]\=passwd" contained
-syn match wgetCommand "^\s*proxy[-_]\=password" contained
-syn match wgetCommand "^\s*proxy[-_]\=user" contained
-syn match wgetCommand "^\s*quiet" contained
-syn match wgetCommand "^\s*quota" contained
-syn match wgetCommand "^\s*random[-_]\=file" contained
-syn match wgetCommand "^\s*random[-_]\=wait" contained
-syn match wgetCommand "^\s*read[-_]\=timeout" contained
-syn match wgetCommand "^\s*reclevel" contained
-syn match wgetCommand "^\s*recursive" contained
-syn match wgetCommand "^\s*referer" contained
-syn match wgetCommand "^\s*reject" contained
-syn match wgetCommand "^\s*relative[-_]\=only" contained
-syn match wgetCommand "^\s*remove[-_]\=listing" contained
-syn match wgetCommand "^\s*restrict[-_]\=file[-_]\=names" contained
-syn match wgetCommand "^\s*retr[-_]\=symlinks" contained
-syn match wgetCommand "^\s*retry[-_]\=connrefused" contained
-syn match wgetCommand "^\s*robots" contained
-syn match wgetCommand "^\s*save[-_]\=cookies" contained
-syn match wgetCommand "^\s*save[-_]\=headers" contained
-syn match wgetCommand "^\s*secure[-_]\=protocol" contained
-syn match wgetCommand "^\s*server[-_]\=response" contained
-" Note: this option was removed in wget 1.8
-syn match wgetCommand "^\s*simple[-_]\=host[-_]\=check" contained
-syn match wgetCommand "^\s*span[-_]\=hosts" contained
-syn match wgetCommand "^\s*spider" contained
-syn match wgetCommand "^\s*strict[-_]\=comments" contained
-syn match wgetCommand "^\s*sslcertfile" contained
-syn match wgetCommand "^\s*sslcertkey" contained
-syn match wgetCommand "^\s*timeout" contained
-syn match wgetCommand "^\s*time[-_]\=stamping" contained
-syn match wgetCommand "^\s*tries" contained
-syn match wgetCommand "^\s*user" contained
-syn match wgetCommand "^\s*use[-_]\=proxy" contained
-syn match wgetCommand "^\s*user[-_]\=agent" contained
-syn match wgetCommand "^\s*verbose" contained
-syn match wgetCommand "^\s*wait" contained
-syn match wgetCommand "^\s*wait[-_]\=retry" contained
+for cmd in s:commands
+  exe 'syn match wgetCommand "' . cmd . '" nextgroup=wgetAssignmentOperator skipwhite contained'
+endfor
 syn case match
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_wget_syn_inits")
-  if version < 508
-    let did_wget_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
+syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
 
-  HiLink wgetAssignmentOperator Special
-  HiLink wgetBoolean            Boolean
-  HiLink wgetCommand            Identifier
-  HiLink wgetComment            Comment
-  HiLink wgetNumber             Number
-  HiLink wgetQuota              Number
-  HiLink wgetString             String
-  HiLink wgetTodo               Todo
-  HiLink wgetValue              Constant
-
-  delcommand HiLink
-endif
+hi def link wgetAssignmentOperator Special
+hi def link wgetBoolean		   Boolean
+hi def link wgetCommand		   Identifier
+hi def link wgetComment		   Comment
+hi def link wgetNumber		   Number
+hi def link wgetQuota		   Number
+hi def link wgetString		   String
+hi def link wgetTodo		   Todo
 
 let b:current_syntax = "wget"
 
-" vim: ts=8
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 fdm=marker: