# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472675408 -7200
# Node ID 46763b01cd9a2629bb55d3fa6aa9369cc280be38
# Parent  b702edc4b2b85940a83d96810c35ec4f9bb695f2
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Aug 31 22:22:10 2016 +0200

    Updated runtime files.  Remove HiLink commands.

diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 7.4.  Last change: 2016 Aug 27
+*channel.txt*      For Vim version 7.4.  Last change: 2016 Aug 31
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -25,7 +25,9 @@ 11. Controlling a job			|job-control|
 
 {Vi does not have any of these features}
 {only when compiled with the |+channel| feature for channel stuff}
+	You can check this with: `has('channel')`
 {only when compiled with the |+job| feature for job stuff}
+	You can check this with: `has('job')`
 
 ==============================================================================
 1. Overview						*job-channel-overview*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4.  Last change: 2016 Aug 30
+*eval.txt*	For Vim version 7.4.  Last change: 2016 Aug 31
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -7778,7 +7778,7 @@ timer_start({time}, {callback} [, {optio
 		busy or Vim is not waiting for input the time will be longer.
 
 		{callback} is the function to call.  It can be the name of a
-		function or a Funcref.  It is called with one argument, which
+		function or a |Funcref|.  It is called with one argument, which
 		is the timer ID.  The callback is only invoked when Vim is
 		waiting for input.
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2016 Aug 30
+*todo.txt*      For Vim version 7.4.  Last change: 2016 Aug 31
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -43,11 +43,15 @@ Test_sign_completion() fails on MS-Windo
 doesn't have both tb_paste.xpm and tb_print.xpm but "tb_p".  Different default
 options?
 
+Patch to trigger autocommands for :cexpr etc. (Yegappan, Aug 30, #1021)
+
 Test_nb_basic() fails on MS-Windows GUI. line 12: Expected 2 but got 1.
 line 13: Expected 20 but got 1.
 
 Figure out building with Ruby on MS-Windows.
 
+Problem with 'incsearch'. (Mike Williams, 2016 Aug 31)
+
 :cexpr doesn't trigger QuickFixCmdPost. (Mathias Stearn, 2016 Aug 29, #1021)
 Needs documentation. (Yegappan)
 
@@ -57,6 +61,7 @@ Patch to make it possible to define a te
 exception. (Christian Brabandt, 2016 Aug 30)
 
 +channel:
+- Add 'cwd' argument: directory to change to in the child.
 - Implement |job-term| ?
 - Channel test fails with Motif.  Sometimes kills the X11 server.
 - When a message in the queue but there is no callback, drop it after a while?
diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	xa 6502 cross assembler
 " Maintainer:	Clemens Kirchgatterer <clemens@1541.org>
-" Last Change:	2014 Jan 05
+" Last Change:	2016 Aug 31
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -136,20 +136,18 @@ syn match  a65Continue	"\\$" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink a65Section	Special
-HiLink a65Address	Special
-HiLink a65Comment	Comment
-HiLink a65PreProc	PreProc
-HiLink a65Number	Number
-HiLink a65String	String
-HiLink a65Type	Statement
-HiLink a65Opcode	Type
-HiLink a65PC		Error
-HiLink a65Todo	Todo
-HiLink a65HiLo	Number
+hi def link a65Section	Special
+hi def link a65Address	Special
+hi def link a65Comment	Comment
+hi def link a65PreProc	PreProc
+hi def link a65Number	Number
+hi def link a65String	String
+hi def link a65Type	Statement
+hi def link a65Opcode	Type
+hi def link a65PC		Error
+hi def link a65Todo	Todo
+hi def link a65HiLo	Number
 
-delcommand HiLink
 
 let b:current_syntax = "a65"
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -169,29 +169,27 @@ syn match   abapTodo     "\#EC\W\+\w\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink abapError          Error
-HiLink abapComment        Comment
-HiLink abapInclude        Include
-HiLink abapStatement      Statement
-HiLink abapComplexStatement      Statement
-HiLink abapSpecial        Special
-HiLink abapNamespace      Special
-HiLink abapSpecialTables  Special
-HiLink abapSymbolOperator abapOperator
-HiLink abapOperator       Operator
-HiLink abapCharString     String
-HiLink abapString         String
-HiLink abapFloat          Float
-HiLink abapTypes          Type
-HiLink abapSymbol         Structure
-HiLink abapStructure      Structure
-HiLink abapField          Variable
-HiLink abapNumber         Number
-HiLink abapHex            Number
+hi def link abapError          Error
+hi def link abapComment        Comment
+hi def link abapInclude        Include
+hi def link abapStatement      Statement
+hi def link abapComplexStatement      Statement
+hi def link abapSpecial        Special
+hi def link abapNamespace      Special
+hi def link abapSpecialTables  Special
+hi def link abapSymbolOperator abapOperator
+hi def link abapOperator       Operator
+hi def link abapCharString     String
+hi def link abapString         String
+hi def link abapFloat          Float
+hi def link abapTypes          Type
+hi def link abapSymbol         Structure
+hi def link abapStructure      Structure
+hi def link abapField          Variable
+hi def link abapNumber         Number
+hi def link abapHex            Number
 
-delcommand HiLink
 
 let b:current_syntax = "abap"
 
diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim
--- a/runtime/syntax/abaqus.vim
+++ b/runtime/syntax/abaqus.vim
@@ -23,15 +23,13 @@ syn match abaqusBadLine	"^\s\+\*.*" disp
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink abaqusComment	Comment
-HiLink abaqusKeyword	Statement
-HiLink abaqusParameter	Identifier
-HiLink abaqusValue	Constant
-HiLink abaqusBadLine    Error
+hi def link abaqusComment	Comment
+hi def link abaqusKeyword	Statement
+hi def link abaqusParameter	Identifier
+hi def link abaqusValue	Constant
+hi def link abaqusBadLine    Error
 
-delcommand HiLink
 
 let b:current_syntax = "abaqus"
diff --git a/runtime/syntax/abc.vim b/runtime/syntax/abc.vim
--- a/runtime/syntax/abc.vim
+++ b/runtime/syntax/abc.vim
@@ -34,19 +34,17 @@ syn match abcComment "%.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink abcComment		Comment
-HiLink abcHeadField		Type
-HiLink abcBodyField		Special
-HiLink abcBar			Statement
-HiLink abcTuple			Statement
-HiLink abcBroken			Statement
-HiLink abcTie			Statement
-HiLink abcGuitarChord	Identifier
-HiLink abcNote			Constant
+hi def link abcComment		Comment
+hi def link abcHeadField		Type
+hi def link abcBodyField		Special
+hi def link abcBar			Statement
+hi def link abcTuple			Statement
+hi def link abcBroken			Statement
+hi def link abcTie			Statement
+hi def link abcGuitarChord	Identifier
+hi def link abcNote			Constant
 
-delcommand HiLink
 
 let b:current_syntax = "abc"
 
diff --git a/runtime/syntax/abel.vim b/runtime/syntax/abel.vim
--- a/runtime/syntax/abel.vim
+++ b/runtime/syntax/abel.vim
@@ -121,39 +121,37 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink abelHeader		abelStatement
-HiLink abelSection		abelStatement
-HiLink abelDeclaration	abelStatement
-HiLink abelLogicalOperator	abelOperator
-HiLink abelRangeOperator	abelOperator
-HiLink abelAlternateOperator	abelOperator
-HiLink abelArithmeticOperator	abelOperator
-HiLink abelRelationalOperator	abelOperator
-HiLink abelAssignmentOperator	abelOperator
-HiLink abelTruthTableOperator	abelOperator
-HiLink abelSpecifier		abelStatement
-HiLink abelOperator		abelStatement
-HiLink abelStatement		Statement
-HiLink abelIdentifier		Identifier
-HiLink abelTypeId		abelType
-HiLink abelTypeIdChar		abelType
-HiLink abelType		Type
-HiLink abelNumber		abelString
-HiLink abelString		String
-HiLink abelConstant		Constant
-HiLink abelComment		Comment
-HiLink abelExtension		abelSpecial
-HiLink abelSpecialChar	abelSpecial
-HiLink abelTypeIdEnd		abelSpecial
-HiLink abelSpecial		Special
-HiLink abelDirective		PreProc
-HiLink abelTodo		Todo
-HiLink abelError		Error
+hi def link abelHeader		abelStatement
+hi def link abelSection		abelStatement
+hi def link abelDeclaration	abelStatement
+hi def link abelLogicalOperator	abelOperator
+hi def link abelRangeOperator	abelOperator
+hi def link abelAlternateOperator	abelOperator
+hi def link abelArithmeticOperator	abelOperator
+hi def link abelRelationalOperator	abelOperator
+hi def link abelAssignmentOperator	abelOperator
+hi def link abelTruthTableOperator	abelOperator
+hi def link abelSpecifier		abelStatement
+hi def link abelOperator		abelStatement
+hi def link abelStatement		Statement
+hi def link abelIdentifier		Identifier
+hi def link abelTypeId		abelType
+hi def link abelTypeIdChar		abelType
+hi def link abelType		Type
+hi def link abelNumber		abelString
+hi def link abelString		String
+hi def link abelConstant		Constant
+hi def link abelComment		Comment
+hi def link abelExtension		abelSpecial
+hi def link abelSpecialChar	abelSpecial
+hi def link abelTypeIdEnd		abelSpecial
+hi def link abelSpecial		Special
+hi def link abelDirective		PreProc
+hi def link abelTodo		Todo
+hi def link abelError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "abel"
 
diff --git a/runtime/syntax/acedb.vim b/runtime/syntax/acedb.vim
--- a/runtime/syntax/acedb.vim
+++ b/runtime/syntax/acedb.vim
@@ -84,26 +84,24 @@ syn region	acedbString	start=/"/ end=/"/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink acedbMagic	Special
-HiLink acedbHyb	Special
-HiLink acedbType	Type
-HiLink acedbOption	Type
-HiLink acedbSubclass	Type
-HiLink acedbSubtag	Include
-HiLink acedbFlag	Include
-HiLink acedbTag	Include
-HiLink acedbClass	Todo
-HiLink acedbHelp	Todo
-HiLink acedbXref	Identifier
-HiLink acedbModifier	Label
-HiLink acedbComment	Comment
-HiLink acedbBlock	ModeMsg
-HiLink acedbNumber	Number
-HiLink acedbString	String
+hi def link acedbMagic	Special
+hi def link acedbHyb	Special
+hi def link acedbType	Type
+hi def link acedbOption	Type
+hi def link acedbSubclass	Type
+hi def link acedbSubtag	Include
+hi def link acedbFlag	Include
+hi def link acedbTag	Include
+hi def link acedbClass	Todo
+hi def link acedbHelp	Todo
+hi def link acedbXref	Identifier
+hi def link acedbModifier	Label
+hi def link acedbComment	Comment
+hi def link acedbBlock	ModeMsg
+hi def link acedbNumber	Number
+hi def link acedbString	String
 
-delcommand HiLink
 
 let b:current_syntax = "acedb"
 
diff --git a/runtime/syntax/aflex.vim b/runtime/syntax/aflex.vim
--- a/runtime/syntax/aflex.vim
+++ b/runtime/syntax/aflex.vim
@@ -63,21 +63,19 @@ syn sync match aflexSyncPat	groupthere a
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink	aflexSlashQuote	aflexPat
-HiLink	aflexBrace		aflexPat
-HiLink aflexAbbrvComment	aflexPatComment
+hi def link aflexSlashQuote	aflexPat
+hi def link aflexBrace		aflexPat
+hi def link aflexAbbrvComment	aflexPatComment
 
-HiLink	aflexAbbrv		SpecialChar
-HiLink	aflexAbbrvRegExp	Macro
-HiLink	aflexCFunctions	Function
-HiLink	aflexMorePat	SpecialChar
-HiLink	aflexPat		Function
-HiLink	aflexPatComment	Comment
-HiLink	aflexPatString	Function
-HiLink	aflexPatTag		Special
-HiLink	aflexSep		Delimiter
-delcommand HiLink
+hi def link aflexAbbrv		SpecialChar
+hi def link aflexAbbrvRegExp	Macro
+hi def link aflexCFunctions	Function
+hi def link aflexMorePat	SpecialChar
+hi def link aflexPat		Function
+hi def link aflexPatComment	Comment
+hi def link aflexPatString	Function
+hi def link aflexPatTag		Special
+hi def link aflexSep		Delimiter
 
 let b:current_syntax = "aflex"
 
diff --git a/runtime/syntax/ahdl.vim b/runtime/syntax/ahdl.vim
--- a/runtime/syntax/ahdl.vim
+++ b/runtime/syntax/ahdl.vim
@@ -64,20 +64,18 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink ahdlNumber		ahdlString
-HiLink ahdlMegafunction	ahdlIdentifier
-HiLink ahdlSpecialChar	SpecialChar
-HiLink ahdlKeyword		Statement
-HiLink ahdlString		String
-HiLink ahdlComment		Comment
-HiLink ahdlIdentifier		Identifier
-HiLink ahdlOperator		Operator
-HiLink ahdlTodo		Todo
+hi def link ahdlNumber		ahdlString
+hi def link ahdlMegafunction	ahdlIdentifier
+hi def link ahdlSpecialChar	SpecialChar
+hi def link ahdlKeyword		Statement
+hi def link ahdlString		String
+hi def link ahdlComment		Comment
+hi def link ahdlIdentifier		Identifier
+hi def link ahdlOperator		Operator
+hi def link ahdlTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "ahdl"
 " vim:ts=8
diff --git a/runtime/syntax/amiga.vim b/runtime/syntax/amiga.vim
--- a/runtime/syntax/amiga.vim
+++ b/runtime/syntax/amiga.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	AmigaDos
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:     7
+" Last Change:	Aug 31, 2016
+" Version:     9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA
 
 " quit when a syntax file was already loaded
@@ -69,22 +69,20 @@ syn match	amiComment	";.*$" contains=ami
 syn sync lines=50
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_amiga_syntax_inits")
 
-HiLink amiAlias	Type
-HiLink amiComment	Comment
-HiLink amiDev	Type
-HiLink amiEcho	String
-HiLink amiElse	Statement
-HiLink amiError	Error
-HiLink amiKey	Statement
-HiLink amiNumber	Number
-HiLink amiString	String
-HiLink amiTest	Special
+  hi def link amiAlias	Type
+  hi def link amiComment	Comment
+  hi def link amiDev	Type
+  hi def link amiEcho	String
+  hi def link amiElse	Statement
+  hi def link amiError	Error
+  hi def link amiKey	Statement
+  hi def link amiNumber	Number
+  hi def link amiString	String
+  hi def link amiTest	Special
 
-delcommand HiLink
-
+endif
 let b:current_syntax = "amiga"
 
 " vim:ts=15
diff --git a/runtime/syntax/aml.vim b/runtime/syntax/aml.vim
--- a/runtime/syntax/aml.vim
+++ b/runtime/syntax/aml.vim
@@ -121,26 +121,24 @@ syn region amlSkip matchgroup=amlOutput 
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink amlComment	Comment
-HiLink amlNumber	Number
-HiLink amlQuote	String
-HiLink amlVar	Identifier
-HiLink amlVar2	Identifier
-HiLink amlFunction	PreProc
-HiLink amlDir	Statement
-HiLink amlDir2	Statement
-HiLink amlDirSym	Statement
-HiLink amlOutput	Statement
-HiLink amlArcCmd	ModeMsg
-HiLink amlFormedCmd	amlArcCmd
-HiLink amlTabCmd	amlArcCmd
-HiLink amlInfoCmd	amlArcCmd
-HiLink amlVtrCmd	amlArcCmd
-HiLink amlFormed	amlArcCmd
-HiLink amlTab	amlArcCmd
+hi def link amlComment	Comment
+hi def link amlNumber	Number
+hi def link amlQuote	String
+hi def link amlVar	Identifier
+hi def link amlVar2	Identifier
+hi def link amlFunction	PreProc
+hi def link amlDir	Statement
+hi def link amlDir2	Statement
+hi def link amlDirSym	Statement
+hi def link amlOutput	Statement
+hi def link amlArcCmd	ModeMsg
+hi def link amlFormedCmd	amlArcCmd
+hi def link amlTabCmd	amlArcCmd
+hi def link amlInfoCmd	amlArcCmd
+hi def link amlVtrCmd	amlArcCmd
+hi def link amlFormed	amlArcCmd
+hi def link amlTab	amlArcCmd
 
-delcommand HiLink
 
 let b:current_syntax = "aml"
diff --git a/runtime/syntax/ampl.vim b/runtime/syntax/ampl.vim
--- a/runtime/syntax/ampl.vim
+++ b/runtime/syntax/ampl.vim
@@ -114,26 +114,24 @@ syn keyword amplTodo contained	 TODO FIX
 
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink amplEntityKeyword	Keyword
-HiLink amplType		Type
-HiLink amplStatement		Statement
-HiLink amplOperators		Operator
-HiLink amplBasicOperators	Operator
-HiLink amplConditional	Conditional
-HiLink amplRepeat		Repeat
-HiLink amplStrings		String
-HiLink amplNumerics		Number
-HiLink amplSetFunction	Function
-HiLink amplBuiltInFunction	Function
-HiLink amplRandomGenerator	Function
-HiLink amplComment		Comment
-HiLink amplDotSuffix		Special
-HiLink amplPiecewise		Special
+hi def link amplEntityKeyword	Keyword
+hi def link amplType		Type
+hi def link amplStatement		Statement
+hi def link amplOperators		Operator
+hi def link amplBasicOperators	Operator
+hi def link amplConditional	Conditional
+hi def link amplRepeat		Repeat
+hi def link amplStrings		String
+hi def link amplNumerics		Number
+hi def link amplSetFunction	Function
+hi def link amplBuiltInFunction	Function
+hi def link amplRandomGenerator	Function
+hi def link amplComment		Comment
+hi def link amplDotSuffix		Special
+hi def link amplPiecewise		Special
 
-delcommand HiLink
 
 let b:current_syntax = "ampl"
 
diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim
--- a/runtime/syntax/antlr.vim
+++ b/runtime/syntax/antlr.vim
@@ -46,10 +46,8 @@ syn match antlrSep "[|:]\|\.\."
 syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN
 syn keyword antlrError DEBUG IGNORE_IN_BNF
 
-command -nargs=+ HiLink hi def link <args>
-HiLink antlrSep Statement
-HiLink antlrPackages Statement
-delcommand HiLink
+hi def link antlrSep Statement
+hi def link antlrPackages Statement
 
 let b:current_syntax = "antlr"
 
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -174,30 +174,28 @@ syn match apacheSection "<\/\=\(<IfVersi
 syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apacheAllowOverride apacheDeclaration
-HiLink apacheAllowOverrideValue apacheOption
-HiLink apacheAuthType apacheDeclaration
-HiLink apacheAuthTypeValue apacheOption
-HiLink apacheOptionOption apacheOption
-HiLink apacheDeclaration Function
-HiLink apacheAnything apacheOption
-HiLink apacheOption Number
-HiLink apacheComment Comment
-HiLink apacheFixme Todo
-HiLink apacheLimitSectionKeyword apacheLimitSection
-HiLink apacheLimitSection apacheSection
-HiLink apacheSection Label
-HiLink apacheMethodOption Type
-HiLink apacheAllowDeny Include
-HiLink apacheAllowDenyValue Identifier
-HiLink apacheOrder Special
-HiLink apacheOrderValue String
-HiLink apacheString String
-HiLink apacheError Error
-HiLink apacheUserID Number
+hi def link apacheAllowOverride apacheDeclaration
+hi def link apacheAllowOverrideValue apacheOption
+hi def link apacheAuthType apacheDeclaration
+hi def link apacheAuthTypeValue apacheOption
+hi def link apacheOptionOption apacheOption
+hi def link apacheDeclaration Function
+hi def link apacheAnything apacheOption
+hi def link apacheOption Number
+hi def link apacheComment Comment
+hi def link apacheFixme Todo
+hi def link apacheLimitSectionKeyword apacheLimitSection
+hi def link apacheLimitSection apacheSection
+hi def link apacheSection Label
+hi def link apacheMethodOption Type
+hi def link apacheAllowDeny Include
+hi def link apacheAllowDenyValue Identifier
+hi def link apacheOrder Special
+hi def link apacheOrderValue String
+hi def link apacheString String
+hi def link apacheError Error
+hi def link apacheUserID Number
 
-delcommand HiLink
 
 let b:current_syntax = "apache"
diff --git a/runtime/syntax/apachestyle.vim b/runtime/syntax/apachestyle.vim
--- a/runtime/syntax/apachestyle.vim
+++ b/runtime/syntax/apachestyle.vim
@@ -39,16 +39,14 @@ syn match  apTagError	contained /[^>]</m
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apComment	Comment
-HiLink apOption	Keyword
-"HiLink apLastValue	Identifier		ugly?
-HiLink apTag		Special
-HiLink apTagOption	Identifier
-HiLink apTagError	Error
+hi def link apComment	Comment
+hi def link apOption	Keyword
+"hi def link apLastValue	Identifier		ugly?
+hi def link apTag		Special
+hi def link apTagOption	Identifier
+hi def link apTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "apachestyle"
 " vim: ts=8
diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -101,28 +101,26 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink asmSection	Special
-HiLink asmLabel	Label
-HiLink asmComment	Comment
-HiLink asmTodo	Todo
-HiLink asmDirective	Statement
-
-HiLink asmInclude	Include
-HiLink asmCond	PreCondit
-HiLink asmMacro	Macro
+hi def link asmSection	Special
+hi def link asmLabel	Label
+hi def link asmComment	Comment
+hi def link asmTodo	Todo
+hi def link asmDirective	Statement
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
-HiLink binNumber	Number
+hi def link asmInclude	Include
+hi def link asmCond	PreCondit
+hi def link asmMacro	Macro
 
-HiLink asmIdentifier	Identifier
-HiLink asmType	Type
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
+hi def link binNumber	Number
 
-delcommand HiLink
+hi def link asmIdentifier	Identifier
+hi def link asmType	Type
+
 
 let b:current_syntax = "asm"
 
diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim
--- a/runtime/syntax/asm68k.vim
+++ b/runtime/syntax/asm68k.vim
@@ -326,7 +326,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -338,42 +337,41 @@ command -nargs=+ HiLink hi def link <arg
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink asm68kComment		Comment
-HiLink asm68kTodo		Todo
+hi def link asm68kComment		Comment
+hi def link asm68kTodo		Todo
 
-HiLink hexNumber		Number		" Constant
-HiLink octNumber		Number		" Constant
-HiLink binNumber		Number		" Constant
-HiLink decNumber		Number		" Constant
-HiLink floatNumber		Number		" Constant
-HiLink floatExponent		Number		" Constant
-HiLink floatE			SpecialChar	" Statement
-"HiLink floatE		Number		" Constant
+hi def link hexNumber		Number		" Constant
+hi def link octNumber		Number		" Constant
+hi def link binNumber		Number		" Constant
+hi def link decNumber		Number		" Constant
+hi def link floatNumber		Number		" Constant
+hi def link floatExponent		Number		" Constant
+hi def link floatE			SpecialChar	" Statement
+"hi def link floatE		Number		" Constant
 
-HiLink asm68kImmediate	SpecialChar	" Statement
-"HiLink asm68kSymbol		Constant
+hi def link asm68kImmediate	SpecialChar	" Statement
+"hi def link asm68kSymbol		Constant
 
-HiLink asm68kString		String		" Constant
-HiLink asm68kCharError	Error
-HiLink asm68kStringError	Error
+hi def link asm68kString		String		" Constant
+hi def link asm68kCharError	Error
+hi def link asm68kStringError	Error
 
-HiLink asm68kReg		Identifier
-HiLink asm68kOperator		Identifier
+hi def link asm68kReg		Identifier
+hi def link asm68kOperator		Identifier
 
-HiLink asm68kInclude		Include		" PreProc
-HiLink asm68kMacro		Macro		" PreProc
-HiLink asm68kMacroParam	Keyword		" Statement
+hi def link asm68kInclude		Include		" PreProc
+hi def link asm68kMacro		Macro		" PreProc
+hi def link asm68kMacroParam	Keyword		" Statement
 
-HiLink asm68kDirective	Special
-HiLink asm68kPreCond		Special
+hi def link asm68kDirective	Special
+hi def link asm68kPreCond		Special
 
 
-HiLink asm68kOpcode		Statement
-HiLink asm68kCond		Conditional	" Statement
-HiLink asm68kRepeat		Repeat		" Statement
+hi def link asm68kOpcode		Statement
+hi def link asm68kCond		Conditional	" Statement
+hi def link asm68kRepeat		Repeat		" Statement
 
-HiLink asm68kLabel		Type
-delcommand HiLink
+hi def link asm68kLabel		Type
 
 let b:current_syntax = "asm68k"
 
diff --git a/runtime/syntax/asmh8300.vim b/runtime/syntax/asmh8300.vim
--- a/runtime/syntax/asmh8300.vim
+++ b/runtime/syntax/asmh8300.vim
@@ -54,16 +54,14 @@ runtime! syntax/asm.vim
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink asmOpcode  Statement
-HiLink asmRegister  Identifier
+hi def link asmOpcode  Statement
+hi def link asmRegister  Identifier
 
 " My default-color overrides:
 "hi asmOpcode ctermfg=yellow
 "hi asmReg	ctermfg=lightmagenta
 
-delcommand HiLink
 
 let b:current_syntax = "asmh8300"
 
diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -48,25 +48,23 @@ syn sync ccomment asnComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink asnDefinition	Function
-HiLink asnBraces		Function
-HiLink asnStructure	Statement
-HiLink asnBoolValue	Boolean
-HiLink asnSpecial		Special
-HiLink asnString		String
-HiLink asnCharacter	Character
-HiLink asnSpecialCharacter	asnSpecial
-HiLink asnNumber		asnValue
-HiLink asnComment		Comment
-HiLink asnLineComment	asnComment
-HiLink asnType		Type
-HiLink asnTypeInfo		PreProc
-HiLink asnValue		Number
-HiLink asnExternal		Include
-HiLink asnTagModifier	Function
-HiLink asnFieldOption	Type
-delcommand HiLink
+hi def link asnDefinition	Function
+hi def link asnBraces		Function
+hi def link asnStructure	Statement
+hi def link asnBoolValue	Boolean
+hi def link asnSpecial		Special
+hi def link asnString		String
+hi def link asnCharacter	Character
+hi def link asnSpecialCharacter	asnSpecial
+hi def link asnNumber		asnValue
+hi def link asnComment		Comment
+hi def link asnLineComment	asnComment
+hi def link asnType		Type
+hi def link asnTypeInfo		PreProc
+hi def link asnValue		Number
+hi def link asnExternal		Include
+hi def link asnTagModifier	Function
+hi def link asnFieldOption	Type
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim
--- a/runtime/syntax/aspvbs.vim
+++ b/runtime/syntax/aspvbs.vim
@@ -158,22 +158,20 @@ syn sync match htmlHighlight grouphere h
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-"HiLink AspVBScript		Special
-HiLink AspVBSLineNumber	Comment
-HiLink AspVBSNumber		Number
-HiLink AspVBSError		Error
-HiLink AspVBSStatement	Statement
-HiLink AspVBSString		String
-HiLink AspVBSComment		Comment
-HiLink AspVBSTodo		Todo
-HiLink AspVBSFunction		Identifier
-HiLink AspVBSMethods		PreProc
-HiLink AspVBSEvents		Special
-HiLink AspVBSTypeSpecifier	Type
+"hi def link AspVBScript		Special
+hi def link AspVBSLineNumber	Comment
+hi def link AspVBSNumber		Number
+hi def link AspVBSError		Error
+hi def link AspVBSStatement	Statement
+hi def link AspVBSString		String
+hi def link AspVBSComment		Comment
+hi def link AspVBSTodo		Todo
+hi def link AspVBSFunction		Identifier
+hi def link AspVBSMethods		PreProc
+hi def link AspVBSEvents		Special
+hi def link AspVBSTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "aspvbs"
 
diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim
--- a/runtime/syntax/asterisk.vim
+++ b/runtime/syntax/asterisk.vim
@@ -57,33 +57,31 @@ syn match       asteriskSetting         
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink        asteriskComment		Comment
-HiLink        asteriskExten		String
-HiLink        asteriskContext         Preproc
-HiLink        asteriskPattern         Type
-HiLink        asteriskApp             Statement
-HiLink        asteriskInclude         Preproc
-HiLink        asteriskIncludeBad	Error
-HiLink        asteriskPriority        Preproc
-HiLink        asteriskLabel           Type
-HiLink        asteriskVar             String
-HiLink        asteriskVarLen          Function
-HiLink        asteriskExp             Type
-HiLink        asteriskCodecsPermit    Preproc
-HiLink        asteriskCodecs          String
-HiLink        asteriskType            Statement
-HiLink        asteriskTypeType        Type
-HiLink        asteriskAuth            String
-HiLink        asteriskAuthType        Type
-HiLink        asteriskIPRange         Identifier
-HiLink        asteriskIP              Identifier
-HiLink        asteriskPort            Identifier
-HiLink        asteriskHostname        Identifier
-HiLink        asteriskSetting         Statement
-HiLink        asteriskError           Error
-delcommand HiLink
+hi def link        asteriskComment		Comment
+hi def link        asteriskExten		String
+hi def link        asteriskContext         Preproc
+hi def link        asteriskPattern         Type
+hi def link        asteriskApp             Statement
+hi def link        asteriskInclude         Preproc
+hi def link        asteriskIncludeBad	Error
+hi def link        asteriskPriority        Preproc
+hi def link        asteriskLabel           Type
+hi def link        asteriskVar             String
+hi def link        asteriskVarLen          Function
+hi def link        asteriskExp             Type
+hi def link        asteriskCodecsPermit    Preproc
+hi def link        asteriskCodecs          String
+hi def link        asteriskType            Statement
+hi def link        asteriskTypeType        Type
+hi def link        asteriskAuth            String
+hi def link        asteriskAuthType        Type
+hi def link        asteriskIPRange         Identifier
+hi def link        asteriskIP              Identifier
+hi def link        asteriskPort            Identifier
+hi def link        asteriskHostname        Identifier
+hi def link        asteriskSetting         Statement
+hi def link        asteriskError           Error
 
 let b:current_syntax = "asterisk" 
 " vim: ts=8 sw=2
diff --git a/runtime/syntax/asteriskvm.vim b/runtime/syntax/asteriskvm.vim
--- a/runtime/syntax/asteriskvm.vim
+++ b/runtime/syntax/asteriskvm.vim
@@ -33,19 +33,17 @@ syn match       comma                   
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink        asteriskvmComment Comment
-HiLink        asteriskvmContext         Identifier
-HiLink        asteriskvmZone            Type
-HiLink        zoneName                String
-HiLink        zoneDef                 String
-HiLink        asteriskvmSetting         Type
-HiLink        asteriskvmSettingBool     Type
+hi def link        asteriskvmComment Comment
+hi def link        asteriskvmContext         Identifier
+hi def link        asteriskvmZone            Type
+hi def link        zoneName                String
+hi def link        zoneDef                 String
+hi def link        asteriskvmSetting         Type
+hi def link        asteriskvmSettingBool     Type
 
-HiLink        asteriskvmMailbox         Statement
-HiLink        mailboxEmail            String
-delcommand HiLink
+hi def link        asteriskvmMailbox         Statement
+hi def link        mailboxEmail            String
 
 let b:current_syntax = "asteriskvm"
 
diff --git a/runtime/syntax/atlas.vim b/runtime/syntax/atlas.vim
--- a/runtime/syntax/atlas.vim
+++ b/runtime/syntax/atlas.vim
@@ -59,28 +59,26 @@ syn sync maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink atlasConditional	Conditional
-HiLink atlasRepeat		Repeat
-HiLink atlasStatement	Statement
-HiLink atlasNumber		Number
-HiLink atlasHexNumber	Number
-HiLink atlasOctalNumber	Number
-HiLink atlasBinNumber	Number
-HiLink atlasDecimalNumber	Float
-HiLink atlasFormatString	String
-HiLink atlasString		String
-HiLink atlasComment		Comment
-HiLink atlasComment2		Comment
-HiLink atlasInclude		Include
-HiLink atlasDefine		Macro
-HiLink atlasReserved		PreCondit
-HiLink atlasStorageClass	StorageClass
-HiLink atlasIdentifier	NONE
-HiLink atlasSpecial		Special
+hi def link atlasConditional	Conditional
+hi def link atlasRepeat		Repeat
+hi def link atlasStatement	Statement
+hi def link atlasNumber		Number
+hi def link atlasHexNumber	Number
+hi def link atlasOctalNumber	Number
+hi def link atlasBinNumber	Number
+hi def link atlasDecimalNumber	Float
+hi def link atlasFormatString	String
+hi def link atlasString		String
+hi def link atlasComment		Comment
+hi def link atlasComment2		Comment
+hi def link atlasInclude		Include
+hi def link atlasDefine		Macro
+hi def link atlasReserved		PreCondit
+hi def link atlasStorageClass	StorageClass
+hi def link atlasIdentifier	NONE
+hi def link atlasSpecial		Special
 
-delcommand HiLink
 
 let b:current_syntax = "atlas"
 
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -54,25 +54,23 @@ syn region  automakeMakeBString start=+`
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink automakePrimary     Statement
-HiLink automakeSecondary   Type
-HiLink automakeExtra       Special
-HiLink automakeOptions     Special
-HiLink automakeClean       Special
-HiLink automakeSubdirs     Statement
-HiLink automakeConditional PreProc
-HiLink automakeSubst       PreProc
-HiLink automakeComment1    makeComment
-HiLink automakeComment2    makeComment
-HiLink automakeMakeError   makeError
-HiLink automakeBadSubst    makeError
-HiLink automakeMakeDString makeDString
-HiLink automakeMakeSString makeSString
-HiLink automakeMakeBString makeBString
+hi def link automakePrimary     Statement
+hi def link automakeSecondary   Type
+hi def link automakeExtra       Special
+hi def link automakeOptions     Special
+hi def link automakeClean       Special
+hi def link automakeSubdirs     Statement
+hi def link automakeConditional PreProc
+hi def link automakeSubst       PreProc
+hi def link automakeComment1    makeComment
+hi def link automakeComment2    makeComment
+hi def link automakeMakeError   makeError
+hi def link automakeBadSubst    makeError
+hi def link automakeMakeDString makeDString
+hi def link automakeMakeSString makeSString
+hi def link automakeMakeBString makeBString
 
-delcommand HiLink
 
 let b:current_syntax = "automake"
 
diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim
--- a/runtime/syntax/ave.vim
+++ b/runtime/syntax/ave.vim
@@ -57,25 +57,23 @@ syn match aveTypos	"!="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting+yet
-command -nargs=+ HiLink hi def link <args>
+
+hi def link aveStatement		Statement
 
-HiLink aveStatement		Statement
-
-HiLink aveString		String
-HiLink aveNumber		Number
+hi def link aveString		String
+hi def link aveNumber		Number
 
-HiLink aveFixVariables	Special
-HiLink aveVariables		Identifier
-HiLink globalVariables	Special
-HiLink aveConst		Special
-
-HiLink aveClassMethods	Function
+hi def link aveFixVariables	Special
+hi def link aveVariables		Identifier
+hi def link globalVariables	Special
+hi def link aveConst		Special
 
-HiLink aveOperator		Operator
-HiLink aveComment		Comment
+hi def link aveClassMethods	Function
 
-HiLink aveTypos		Error
+hi def link aveOperator		Operator
+hi def link aveComment		Comment
 
-delcommand HiLink
+hi def link aveTypos		Error
+
 
 let b:current_syntax = "ave"
diff --git a/runtime/syntax/ayacc.vim b/runtime/syntax/ayacc.vim
--- a/runtime/syntax/ayacc.vim
+++ b/runtime/syntax/ayacc.vim
@@ -47,28 +47,26 @@ syn match	ayaccSep	"^[ \t]*%}"
 syn match	ayaccCurlyError	"[{}]"
 syn region	ayaccAction	matchgroup=ayaccCurly start="{" end="}" contains=ALLBUT,@ayaccActionGroup
 
-command -nargs=+ HiLink hi def link <args>
 
 " Internal ayacc highlighting links
-HiLink ayaccBrkt	ayaccStmt
-HiLink ayaccKey	ayaccStmt
-HiLink ayaccOper	ayaccStmt
-HiLink ayaccUnionStart	ayaccKey
+hi def link ayaccBrkt	ayaccStmt
+hi def link ayaccKey	ayaccStmt
+hi def link ayaccOper	ayaccStmt
+hi def link ayaccUnionStart	ayaccKey
 
 " External ayacc highlighting links
-HiLink ayaccCurly	Delimiter
-HiLink ayaccCurlyError	Error
-HiLink ayaccDefinition	Function
-HiLink ayaccDelim	Function
-HiLink ayaccKeyActn	Special
-HiLink ayaccSectionSep	Todo
-HiLink ayaccSep	Delimiter
-HiLink ayaccStmt	Statement
-HiLink ayaccType	Type
+hi def link ayaccCurly	Delimiter
+hi def link ayaccCurlyError	Error
+hi def link ayaccDefinition	Function
+hi def link ayaccDelim	Function
+hi def link ayaccKeyActn	Special
+hi def link ayaccSectionSep	Todo
+hi def link ayaccSep	Delimiter
+hi def link ayaccStmt	Statement
+hi def link ayaccType	Type
 
 " since Bram doesn't like my Delimiter :|
-HiLink Delimiter	Type
-delcommand HiLink
+hi def link Delimiter	Type
 
 let b:current_syntax = "ayacc"
 
diff --git a/runtime/syntax/b.vim b/runtime/syntax/b.vim
--- a/runtime/syntax/b.vim
+++ b/runtime/syntax/b.vim
@@ -68,48 +68,46 @@ syn sync ccomment bComment minlines=10
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink bLabel	Label
-HiLink bUserLabel	Label
-HiLink bConditional	Conditional
-HiLink bRepeat	Repeat
-HiLink bLogic	Special
-HiLink bCharacter	Character
-HiLink bSpecialCharacter bSpecial
-HiLink bNumber	Number
-HiLink bFloat	Float
-HiLink bOctalError	bError
-HiLink bParenError	bError
-" HiLink bInParen	bError
-HiLink bCommentError	bError
-HiLink bBoolean	Identifier
-HiLink bConstant	Identifier
-HiLink bGuard	Identifier
-HiLink bOperator	Operator
-HiLink bKeywords	Operator
-HiLink bOps		Identifier
-HiLink bStructure	Structure
-HiLink bStorageClass	StorageClass
-HiLink bInclude	Include
-HiLink bPreProc	PreProc
-HiLink bDefine	Macro
-HiLink bIncluded	bString
-HiLink bError	Error
-HiLink bStatement	Statement
-HiLink bPreCondit	PreCondit
-HiLink bType		Type
-HiLink bCommentError	bError
-HiLink bCommentString bString
-HiLink bComment2String bString
-HiLink bCommentSkip	bComment
-HiLink bString	String
-HiLink bComment	Comment
-HiLink bSpecial	SpecialChar
-HiLink bTodo		Todo
+hi def link bLabel	Label
+hi def link bUserLabel	Label
+hi def link bConditional	Conditional
+hi def link bRepeat	Repeat
+hi def link bLogic	Special
+hi def link bCharacter	Character
+hi def link bSpecialCharacter bSpecial
+hi def link bNumber	Number
+hi def link bFloat	Float
+hi def link bOctalError	bError
+hi def link bParenError	bError
+" hi def link bInParen	bError
+hi def link bCommentError	bError
+hi def link bBoolean	Identifier
+hi def link bConstant	Identifier
+hi def link bGuard	Identifier
+hi def link bOperator	Operator
+hi def link bKeywords	Operator
+hi def link bOps		Identifier
+hi def link bStructure	Structure
+hi def link bStorageClass	StorageClass
+hi def link bInclude	Include
+hi def link bPreProc	PreProc
+hi def link bDefine	Macro
+hi def link bIncluded	bString
+hi def link bError	Error
+hi def link bStatement	Statement
+hi def link bPreCondit	PreCondit
+hi def link bType		Type
+hi def link bCommentError	bError
+hi def link bCommentString bString
+hi def link bComment2String bString
+hi def link bCommentSkip	bComment
+hi def link bString	String
+hi def link bComment	Comment
+hi def link bSpecial	SpecialChar
+hi def link bTodo		Todo
 "hi link bIdentifier	Identifier
-delcommand HiLink
 
 let b:current_syntax = "b"
 
diff --git a/runtime/syntax/baan.vim b/runtime/syntax/baan.vim
--- a/runtime/syntax/baan.vim
+++ b/runtime/syntax/baan.vim
@@ -1888,31 +1888,29 @@ syn keyword baanBshell bclm.set.desktop
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink baanConditional	Conditional
-HiLink baan3gl		Statement
-HiLink baan3glpre		PreProc
-HiLink baan4gl		Statement
-HiLink baan4glh		Statement
-HiLink baansql		Statement
-HiLink baansqlh		Statement
-HiLink baanDalHook		Statement
-HiLink baanNumber		Number
-HiLink baanString		String
-HiLink baanOpenStringError	Error
-HiLink baanConstant		Constant
-HiLink baanComment		Comment
-HiLink baanCommenth		Comment
-HiLink baanUncommented	Comment
-HiLink baanDLLUsage		Comment
-HiLink baanFunUsage		Comment
-HiLink baanIdentifier		Normal
-HiLink baanBshell		Function
-HiLink baanType		Type
-HiLink baanStorageClass	StorageClass
+hi def link baanConditional	Conditional
+hi def link baan3gl		Statement
+hi def link baan3glpre		PreProc
+hi def link baan4gl		Statement
+hi def link baan4glh		Statement
+hi def link baansql		Statement
+hi def link baansqlh		Statement
+hi def link baanDalHook		Statement
+hi def link baanNumber		Number
+hi def link baanString		String
+hi def link baanOpenStringError	Error
+hi def link baanConstant		Constant
+hi def link baanComment		Comment
+hi def link baanCommenth		Comment
+hi def link baanUncommented	Comment
+hi def link baanDLLUsage		Comment
+hi def link baanFunUsage		Comment
+hi def link baanIdentifier		Normal
+hi def link baanBshell		Function
+hi def link baanType		Type
+hi def link baanStorageClass	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "baan"
 
diff --git a/runtime/syntax/basic.vim b/runtime/syntax/basic.vim
--- a/runtime/syntax/basic.vim
+++ b/runtime/syntax/basic.vim
@@ -141,25 +141,23 @@ syn match   basicMathsOperator   "-\|=\|
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink basicLabel		Label
-HiLink basicConditional	Conditional
-HiLink basicRepeat		Repeat
-HiLink basicLineNumber	Comment
-HiLink basicNumber		Number
-HiLink basicError		Error
-HiLink basicStatement	Statement
-HiLink basicString		String
-HiLink basicComment		Comment
-HiLink basicSpecial		Special
-HiLink basicTodo		Todo
-HiLink basicFunction		Identifier
-HiLink basicTypeSpecifier Type
-HiLink basicFilenumber basicTypeSpecifier
+hi def link basicLabel		Label
+hi def link basicConditional	Conditional
+hi def link basicRepeat		Repeat
+hi def link basicLineNumber	Comment
+hi def link basicNumber		Number
+hi def link basicError		Error
+hi def link basicStatement	Statement
+hi def link basicString		String
+hi def link basicComment		Comment
+hi def link basicSpecial		Special
+hi def link basicTodo		Todo
+hi def link basicFunction		Identifier
+hi def link basicTypeSpecifier Type
+hi def link basicFilenumber basicTypeSpecifier
 "hi basicMathsOperator term=bold cterm=bold gui=bold
 
-delcommand HiLink
 
 let b:current_syntax = "basic"
 
diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -51,18 +51,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bcKeyword		Statement
-HiLink bcType		Type
-HiLink bcConstant		Constant
-HiLink bcNumber		Number
-HiLink bcComment		Comment
-HiLink bcString		String
-HiLink bcSpecialChar		SpecialChar
-HiLink bcParenError		Error
+hi def link bcKeyword		Statement
+hi def link bcType		Type
+hi def link bcConstant		Constant
+hi def link bcNumber		Number
+hi def link bcComment		Comment
+hi def link bcString		String
+hi def link bcSpecialChar		SpecialChar
+hi def link bcParenError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "bc"
 " vim: ts=8
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -101,17 +101,15 @@ syn sync minlines=50
 " =====================
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bibType	Identifier
-HiLink bibEntryKw	Statement
-HiLink bibNSEntryKw	PreProc
-HiLink bibKey		Special
-HiLink bibVariable	Constant
-HiLink bibUnescapedSpecial	Error
-HiLink bibComment	Comment
-HiLink bibComment2	Comment
-delcommand HiLink
+hi def link bibType	Identifier
+hi def link bibEntryKw	Statement
+hi def link bibNSEntryKw	PreProc
+hi def link bibKey		Special
+hi def link bibVariable	Constant
+hi def link bibUnescapedSpecial	Error
+hi def link bibComment	Comment
+hi def link bibComment2	Comment
 
 let b:current_syntax = "bib"
 
diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -68,31 +68,29 @@ syn match       zoneComment     /;.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink zoneDirective    Macro
+hi def link zoneDirective    Macro
 
-HiLink zoneUnknown      Error
+hi def link zoneUnknown      Error
 
-HiLink zoneOrigin       Statement
-HiLink zoneOwnerName    Statement
-HiLink zoneDomain       Identifier
+hi def link zoneOrigin       Statement
+hi def link zoneOwnerName    Statement
+hi def link zoneDomain       Identifier
 
-HiLink zoneSpecial      Special
-HiLink zoneTTL          Constant
-HiLink zoneClass        Include
-HiLink zoneRRType       Type
+hi def link zoneSpecial      Special
+hi def link zoneTTL          Constant
+hi def link zoneClass        Include
+hi def link zoneRRType       Type
 
-HiLink zoneIPAddr       Number
-HiLink zoneIP6Addr      Number
-HiLink zoneText         String
-HiLink zoneNumber       Number
-HiLink zoneSerial       Special
+hi def link zoneIPAddr       Number
+hi def link zoneIP6Addr      Number
+hi def link zoneText         String
+hi def link zoneNumber       Number
+hi def link zoneSerial       Special
 
-HiLink zoneErrParen     Error
-HiLink zoneComment      Comment
+hi def link zoneErrParen     Error
+hi def link zoneComment      Comment
 
-delcommand HiLink
 
 let b:current_syntax = "bindzone"
 
diff --git a/runtime/syntax/blank.vim b/runtime/syntax/blank.vim
--- a/runtime/syntax/blank.vim
+++ b/runtime/syntax/blank.vim
@@ -26,13 +26,11 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink blankInstruction      Statement
-HiLink blankNumber	       Number
-HiLink blankString	       String
+hi def link blankInstruction      Statement
+hi def link blankNumber	       Number
+hi def link blankString	       String
 
-delcommand HiLink
 
 let b:current_syntax = "blank"
 
diff --git a/runtime/syntax/bst.vim b/runtime/syntax/bst.vim
--- a/runtime/syntax/bst.vim
+++ b/runtime/syntax/bst.vim
@@ -54,18 +54,16 @@ syn keyword bstField          volume yea
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bstComment           Comment
-HiLink bstString            String
-HiLink bstCommand           PreProc
-HiLink bstBuiltIn           Statement
-HiLink bstField             Special
-HiLink bstNumber            Number
-HiLink bstType              Type
-HiLink bstIdentifier        Identifier
-HiLink bstError             Error
-delcommand HiLink
+hi def link bstComment           Comment
+hi def link bstString            String
+hi def link bstCommand           PreProc
+hi def link bstBuiltIn           Statement
+hi def link bstField             Special
+hi def link bstNumber            Number
+hi def link bstType              Type
+hi def link bstIdentifier        Identifier
+hi def link bstError             Error
 
 let b:current_syntax = "bst"
 
diff --git a/runtime/syntax/btm.vim b/runtime/syntax/btm.vim
--- a/runtime/syntax/btm.vim
+++ b/runtime/syntax/btm.vim
@@ -182,36 +182,34 @@ syn keyword btmCommand	vscrput y
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink btmLabel		Special
-HiLink btmLabelMark		Special
-HiLink btmCmdDivider		Special
-HiLink btmConditional		btmStatement
-HiLink btmDotBoolOp		btmStatement
-HiLink btmRepeat		btmStatement
-HiLink btmEchoCommand	btmStatement
-HiLink btmEchoParam		btmStatement
-HiLink btmStatement		Statement
-HiLink btmTodo		Todo
-HiLink btmString		String
-HiLink btmNumber		Number
-HiLink btmComment		Comment
-HiLink btmArgument		Identifier
-HiLink btmVariable		Identifier
-HiLink btmEcho		String
-HiLink btmBIFMatch		btmStatement
-HiLink btmBuiltInFunc		btmStatement
-HiLink btmBuiltInVar		btmStatement
-HiLink btmSpecialVar		btmStatement
-HiLink btmCommand		btmStatement
+hi def link btmLabel		Special
+hi def link btmLabelMark		Special
+hi def link btmCmdDivider		Special
+hi def link btmConditional		btmStatement
+hi def link btmDotBoolOp		btmStatement
+hi def link btmRepeat		btmStatement
+hi def link btmEchoCommand	btmStatement
+hi def link btmEchoParam		btmStatement
+hi def link btmStatement		Statement
+hi def link btmTodo		Todo
+hi def link btmString		String
+hi def link btmNumber		Number
+hi def link btmComment		Comment
+hi def link btmArgument		Identifier
+hi def link btmVariable		Identifier
+hi def link btmEcho		String
+hi def link btmBIFMatch		btmStatement
+hi def link btmBuiltInFunc		btmStatement
+hi def link btmBuiltInVar		btmStatement
+hi def link btmSpecialVar		btmStatement
+hi def link btmCommand		btmStatement
 
 "optional highlighting
-"HiLink btmShowTab		Error
-"HiLink btmShowTabc		Error
-"hiLink btmIdentifier		Identifier
+"hi def link btmShowTab		Error
+"hi def link btmShowTabc		Error
+"hi def link btmIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "btm"
 
diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim
--- a/runtime/syntax/bzr.vim
+++ b/runtime/syntax/bzr.vim
@@ -38,15 +38,13 @@ syn sync match bzrSync  grouphere bzrReg
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bzrRemoved    Constant
-HiLink bzrAdded      Identifier
-HiLink bzrModified   Special
-HiLink bzrRenamed    Special
-HiLink bzrUnchanged  Special
-HiLink bzrUnknown    Special
+hi def link bzrRemoved    Constant
+hi def link bzrAdded      Identifier
+hi def link bzrModified   Special
+hi def link bzrRenamed    Special
+hi def link bzrUnchanged  Special
+hi def link bzrUnknown    Special
 
-delcommand HiLink
 
 let b:current_syntax = "bzr"
diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -103,18 +103,16 @@ syn match	cabalStatement	"\cversion"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cabalVersion       Number
-HiLink cabalTruth         Boolean
-HiLink cabalComment       Comment
-HiLink cabalStatement     Statement
-HiLink cabalCategory      Type
-HiLink cabalFunction      Function
-HiLink cabalConditional   Conditional
-HiLink cabalOperator      Operator
-HiLink cabalCompiler      Constant
-delcommand HiLink
+hi def link cabalVersion       Number
+hi def link cabalTruth         Boolean
+hi def link cabalComment       Comment
+hi def link cabalStatement     Statement
+hi def link cabalCategory      Type
+hi def link cabalFunction      Function
+hi def link cabalConditional   Conditional
+hi def link cabalOperator      Operator
+hi def link cabalCompiler      Constant
 
 let b:current_syntax = "cabal"
 
diff --git a/runtime/syntax/cdl.vim b/runtime/syntax/cdl.vim
index 501dcfc7e491d7e543480512bd55d3b44a3e5588..23d70040f971ca030105a1d9b5c7b3edb7f51413
GIT binary patch
literal 3100
zc$}S9ZBOJj5boFHSIk9f1A8m>XjQ3NvGlITQc*#v4%$N^6nW#>tVLqyYzKCA*Z%g7
zoqb6HdxCy|o!B$a%sew5JA%JN0cIgBo5NJ(7)Ef)WLB{Zhwxq%X2vwaktk3ap(GsP
zR7hc+xY8q&GbRW@NYumN1FLelz^u{?-lcetT)}~+MdR0)UwSLinv|8eN5Y|ZYAmEP
zg2Z9){hK%Y@EgJWupiRir%G6On4tvL3>6-j0hViId;z&)9C;|FfOBE2*@-5@w9*=-
zy{&Dc-7s*mn^}mGi)k2|1*FU%h)gPt?vpfAm}*MfGHu<;9WEY}=0VEy3(G7L4>sUy
zI%Wbj)9GvhnO0R<|KBW{bcVd5P}7_l)4{u3lo$kzbEryA&~;KNNtx0MD2Pu=&!U#B
zK+ssIdt`Y|5)q=2gH(1Ucc9-Z%Fq>w<pEJ*9d}3taP-g*cmjY)4oW*1NR>38OAGV7
zoAz-fQwJ5ipNX8GPvK-GoFbd9<RdgGp)zTmM(fL|wHD5>n4mr})L)fb2s<86IFT%-
z#9}~k`M%;HC|}0|CnWz*i_*6tMQn*lC^e?S7sV`!iORv1|F$;rWx1_+B!0d09H(=t
zUwY^0ny?&Ln!13!H_5D_zVXDVT-5bbx~OsnWop%fgv!w2fD*M(T%^J-oX3LMbhg!B
zoH{xa({lmF&(JTK>+lyCWV$5n27k{qdTC%}^5WQB1(6Gxkxk)y<T+LqjiVPhS*i>E
z9Oc#deF1*M#QA7hTv$!n1%u@J`tO^Y-pycTXhyXA0S)b^7I~k(epmLQDodqpeY)2m
z8?}bp!S#2&{_V|xrlmX1W@QQA^x?V>H!XxFbPHn`y^0B=JEs&^K|}BI{OBBxPp;0!
zaCLR%r)XXo>u7M3r*I?kS3eD#**TO}6idw@9t`$+@kaM;2gMm_%-jTOSor}xiUvt9
za>sKNCA~qk9fZzi&YyBW4!mX9_VR~o-N0%lP2I&%`-^vC?=9YK1pMyw^p`&``zy0?
z|Le7k{=cVI)Act=tbKo^l8sww)*%JaZsZ-e*S&h9vQcuEypFo{Kc4%Wimo0-my;W?
zoW|Q!QJ>+w)NTN0Wbg4Gn{Cja1+Zb}cpf~(iwkiJH;r4b-?+H?>yy`^td5Y<MeF;c
zKs!@><YHQ{xsTCKhBl`hcJ7C{tcutByQ6>O&vEi4`O@BT>w`g(m?Y^X$>$&c+3Q(0
z$uZvjIX>Kvhx_5T4phDB`Yf2NSRUrIIvM&R-8vo(<$EBe$>A_LaF@6j>Wh3W)`Gjx
zlf&3Om;4hA-K9_W<dhy>mYyluET=z9B<zvOxy%>K7nKA-uNtZd8X1!&yT_I~EYODG
zOgJo{RPUhm6k1DNmHKt#3GVDH8{?_1#z@_WkDdD|TK{x68`JS4(~>mK%p;}N032(r
z^b<<;*z;qnv$L8(%ik^A<E_ZcGx^o+`e<%bS-;6v!s8e=55R^ThRYUfKaF7o5gA3U
Od+tRs1Zze=h5rGBolW5Y

diff --git a/runtime/syntax/cf.vim b/runtime/syntax/cf.vim
--- a/runtime/syntax/cf.vim
+++ b/runtime/syntax/cf.vim
@@ -379,61 +379,58 @@ syn region	cfqueryTag	contained start=+<
 syn region	cfSqlregion	start=+<cfquery\_[^>]*>+ keepend end=+</cfquery>+me=s-1 matchgroup=NONE contains=@cfSql,cfComment,@htmlTagNameCluster,cfqueryTag,cfHashRegion
 
 " Define the highlighting.
-command -nargs=+ CfHiLink hi def link <args>
 
 if exists("d_noinclude_html")
   " The default html-style highlighting copied from html.vim.
-  CfHiLink htmlTag		Function
-  CfHiLink htmlEndTag		Identifier
-  CfHiLink htmlArg		Type
-  CfHiLink htmlTagName		htmlStatement
-  CfHiLink htmlValue		String
-  CfHiLink htmlPreProc		PreProc
-  CfHiLink htmlString		String
-  CfHiLink htmlStatement	Statement
-  CfHiLink htmlValue		String
-  CfHiLink htmlTagError		htmlError
-  CfHiLink htmlError		Error
+  hi def link htmlTag		Function
+  hi def link htmlEndTag		Identifier
+  hi def link htmlArg		Type
+  hi def link htmlTagName		htmlStatement
+  hi def link htmlValue		String
+  hi def link htmlPreProc		PreProc
+  hi def link htmlString		String
+  hi def link htmlStatement	Statement
+  hi def link htmlValue		String
+  hi def link htmlTagError		htmlError
+  hi def link htmlError		Error
 endif
 
-CfHiLink cfTagName		Statement
-CfHiLink cfCustomTagName	Statement
-CfHiLink cfArg			Type
-CfHiLink cfFunctionName		Function
-CfHiLink cfHashRegion		PreProc
-CfHiLink cfComment		Comment
-CfHiLink cfCommentTodo		Todo
-CfHiLink cfOperator		Operator
-CfHiLink cfOperatorMatch	Operator
-CfHiLink cfScope		Title
-CfHiLink cfBool			Constant
+hi def link cfTagName		Statement
+hi def link cfCustomTagName	Statement
+hi def link cfArg			Type
+hi def link cfFunctionName		Function
+hi def link cfHashRegion		PreProc
+hi def link cfComment		Comment
+hi def link cfCommentTodo		Todo
+hi def link cfOperator		Operator
+hi def link cfOperatorMatch	Operator
+hi def link cfScope		Title
+hi def link cfBool			Constant
 
-CfHiLink cfscriptBlock		Special
-CfHiLink cfscriptTag		htmlTag
-CfHiLink cfSetRegion		PreProc
-CfHiLink cfSetLHSRegion		htmlTag
-CfHiLink cfSetTagEnd		htmlTag
+hi def link cfscriptBlock		Special
+hi def link cfscriptTag		htmlTag
+hi def link cfSetRegion		PreProc
+hi def link cfSetLHSRegion		htmlTag
+hi def link cfSetTagEnd		htmlTag
 
-CfHiLink cfScriptLineComment	Comment
-CfHiLink cfScriptComment	Comment
-CfHiLink cfScriptStringS	String
-CfHiLink cfScriptStringD	String
-CfHiLink cfScriptNumber		cfScriptValue
-CfHiLink cfScriptConditional	Conditional
-CfHiLink cfScriptRepeat		Repeat
-CfHiLink cfScriptBranch		Conditional
-CfHiLink cfScriptSpecial	Type
-CfHiLink cfScriptStatement	Statement
-CfHiLink cfScriptBraces		Function
-CfHiLink cfScriptKeyword	Function
-CfHiLink cfScriptError		Error
-CfHiLink cfDeprecatedTag	Error
-CfHiLink cfDeprecatedFunction	Error
-CfHiLink cfScrParenError	cfScriptError
+hi def link cfScriptLineComment	Comment
+hi def link cfScriptComment	Comment
+hi def link cfScriptStringS	String
+hi def link cfScriptStringD	String
+hi def link cfScriptNumber		cfScriptValue
+hi def link cfScriptConditional	Conditional
+hi def link cfScriptRepeat		Repeat
+hi def link cfScriptBranch		Conditional
+hi def link cfScriptSpecial	Type
+hi def link cfScriptStatement	Statement
+hi def link cfScriptBraces		Function
+hi def link cfScriptKeyword	Function
+hi def link cfScriptError		Error
+hi def link cfDeprecatedTag	Error
+hi def link cfDeprecatedFunction	Error
+hi def link cfScrParenError	cfScriptError
 
-CfHiLink cfqueryTag		htmlTag
-
-delcommand CfHiLink
+hi def link cfqueryTag		htmlTag
 
 let b:current_syntax = "cf"
 
diff --git a/runtime/syntax/cfg.vim b/runtime/syntax/cfg.vim
--- a/runtime/syntax/cfg.vim
+++ b/runtime/syntax/cfg.vim
@@ -34,17 +34,15 @@ syn match  CfgComment	"\/\/.*"
 
 " Define the default hightlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink CfgOnOff     Label
-HiLink CfgComment	Comment
-HiLink CfgSection	Type
-HiLink CfgString	String
-HiLink CfgParams    Keyword
-HiLink CfgValues    Constant
-HiLink CfgDirectory Directory
-HiLink UncPath      Directory
+hi def link CfgOnOff     Label
+hi def link CfgComment	Comment
+hi def link CfgSection	Type
+hi def link CfgString	String
+hi def link CfgParams    Keyword
+hi def link CfgValues    Constant
+hi def link CfgDirectory Directory
+hi def link UncPath      Directory
 
-delcommand HiLink
 
 let b:current_syntax = "cfg"
 " vim:ts=8
diff --git a/runtime/syntax/ch.vim b/runtime/syntax/ch.vim
--- a/runtime/syntax/ch.vim
+++ b/runtime/syntax/ch.vim
@@ -26,14 +26,12 @@ syn keyword	chStructure	class
 syn keyword	chType		string_t array
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink chAccess		chStatement
-HiLink chExceptions		Exception
-HiLink chStatement		Statement
-HiLink chType			Type
-HiLink chStructure		Structure
-delcommand HiLink
+hi def link chAccess		chStatement
+hi def link chExceptions		Exception
+hi def link chStatement		Statement
+hi def link chType			Type
+hi def link chStructure		Structure
 
 let b:current_syntax = "ch"
 
diff --git a/runtime/syntax/change.vim b/runtime/syntax/change.vim
--- a/runtime/syntax/change.vim
+++ b/runtime/syntax/change.vim
@@ -19,12 +19,10 @@ syn region changeToMaterial start="^@y.*
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink changeFromMaterial String
-HiLink changeToMaterial Statement
+hi def link changeFromMaterial String
+hi def link changeToMaterial Statement
 
-delcommand HiLink
 
 let b:current_syntax = "change"
 
diff --git a/runtime/syntax/changelog.vim b/runtime/syntax/changelog.vim
--- a/runtime/syntax/changelog.vim
+++ b/runtime/syntax/changelog.vim
@@ -39,21 +39,19 @@ syn match	changelogNumber	contained "[.-
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink changelogText		Normal
-HiLink changelogBullet	Type
-HiLink changelogColon		Type
-HiLink changelogFiles		Comment
-HiLink changelogFuncs	Comment
-HiLink changelogHeader	Statement
-HiLink changelogMail		Special
-HiLink changelogNumber	Number
-HiLink changelogMonth		Number
-HiLink changelogDay		Number
-HiLink changelogError		Folded
+hi def link changelogText		Normal
+hi def link changelogBullet	Type
+hi def link changelogColon		Type
+hi def link changelogFiles		Comment
+hi def link changelogFuncs	Comment
+hi def link changelogHeader	Statement
+hi def link changelogMail		Special
+hi def link changelogNumber	Number
+hi def link changelogMonth		Number
+hi def link changelogDay		Number
+hi def link changelogError		Folded
 
-delcommand HiLink
 
 let b:current_syntax = "changelog"
 
diff --git a/runtime/syntax/cheetah.vim b/runtime/syntax/cheetah.vim
--- a/runtime/syntax/cheetah.vim
+++ b/runtime/syntax/cheetah.vim
@@ -34,16 +34,14 @@ syn region  cheetahMultiLineComment star
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cheetahPlaceHolder Identifier
-HiLink cheetahDirective PreCondit
-HiLink cheetahKeyword Define
-HiLink cheetahContinuation Special
-HiLink cheetahComment Comment
-HiLink cheetahMultiLineComment Comment
+hi def link cheetahPlaceHolder Identifier
+hi def link cheetahDirective PreCondit
+hi def link cheetahKeyword Define
+hi def link cheetahContinuation Special
+hi def link cheetahComment Comment
+hi def link cheetahMultiLineComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "cheetah"
 
diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim
--- a/runtime/syntax/chill.vim
+++ b/runtime/syntax/chill.vim
@@ -122,58 +122,56 @@ exec "syn sync ccomment chillComment min
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink chillLabel	Label
-HiLink chillUserLabel	Label
-HiLink chillConditional	Conditional
-" hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
+hi def link chillLabel	Label
+hi def link chillUserLabel	Label
+hi def link chillConditional	Conditional
+" hi def link chillConditional	term=bold ctermfg=red guifg=red gui=bold
 
-HiLink chillRepeat	Repeat
-HiLink chillProcess	Repeat
-HiLink chillSignal	Repeat
-HiLink chillCharacter	Character
-HiLink chillSpecialCharacter chillSpecial
-HiLink chillNumber	Number
-HiLink chillFloat	Float
-HiLink chillOctalError	chillError
-HiLink chillParenError	chillError
-HiLink chillInParen	chillError
-HiLink chillCommentError	chillError
-HiLink chillSpaceError	chillError
-HiLink chillOperator	Operator
-HiLink chillStructure	Structure
-HiLink chillBlock	Operator
-HiLink chillScope	Operator
-"hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
-HiLink chillEDML	PreProc
-"hi chillBoolConst	term=bold ctermfg=brown guifg=brown
-HiLink chillBoolConst	Constant
-"hi chillLogical	term=bold ctermfg=brown guifg=brown
-HiLink chillLogical	Constant
-HiLink chillStorageClass	StorageClass
-HiLink chillInclude	Include
-HiLink chillPreProc	PreProc
-HiLink chillDefine	Macro
-HiLink chillIncluded	chillString
-HiLink chillError	Error
-HiLink chillStatement	Statement
-HiLink chillPreCondit	PreCondit
-HiLink chillType	Type
-HiLink chillCommentError	chillError
-HiLink chillCommentString chillString
-HiLink chillComment2String chillString
-HiLink chillCommentSkip	chillComment
-HiLink chillString	String
-HiLink chillComment	Comment
-" hi chillComment	term=None ctermfg=lightblue guifg=lightblue
-HiLink chillSpecial	SpecialChar
-HiLink chillTodo	Todo
-HiLink chillBlock	Statement
-"HiLink chillIdentifier	Identifier
-HiLink chillBracket	Delimiter
+hi def link chillRepeat	Repeat
+hi def link chillProcess	Repeat
+hi def link chillSignal	Repeat
+hi def link chillCharacter	Character
+hi def link chillSpecialCharacter chillSpecial
+hi def link chillNumber	Number
+hi def link chillFloat	Float
+hi def link chillOctalError	chillError
+hi def link chillParenError	chillError
+hi def link chillInParen	chillError
+hi def link chillCommentError	chillError
+hi def link chillSpaceError	chillError
+hi def link chillOperator	Operator
+hi def link chillStructure	Structure
+hi def link chillBlock	Operator
+hi def link chillScope	Operator
+"hi def link chillEDML     term=underline ctermfg=DarkRed guifg=Red
+hi def link chillEDML	PreProc
+"hi def link chillBoolConst	term=bold ctermfg=brown guifg=brown
+hi def link chillBoolConst	Constant
+"hi def link chillLogical	term=bold ctermfg=brown guifg=brown
+hi def link chillLogical	Constant
+hi def link chillStorageClass	StorageClass
+hi def link chillInclude	Include
+hi def link chillPreProc	PreProc
+hi def link chillDefine	Macro
+hi def link chillIncluded	chillString
+hi def link chillError	Error
+hi def link chillStatement	Statement
+hi def link chillPreCondit	PreCondit
+hi def link chillType	Type
+hi def link chillCommentError	chillError
+hi def link chillCommentString chillString
+hi def link chillComment2String chillString
+hi def link chillCommentSkip	chillComment
+hi def link chillString	String
+hi def link chillComment	Comment
+" hi def link chillComment	term=None ctermfg=lightblue guifg=lightblue
+hi def link chillSpecial	SpecialChar
+hi def link chillTodo	Todo
+hi def link chillBlock	Statement
+"hi def link chillIdentifier	Identifier
+hi def link chillBracket	Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "chill"
 
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -69,31 +69,29 @@ syn keyword	clStatement	clear clear_eol 
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink clifError	Error
-HiLink clSpaceError	Error
-HiLink clWhile		Repeat
-HiLink clConditional	Conditional
-HiLink clDebug		Debug
-HiLink clNeedsWork	Todo
-HiLink clTodo		Todo
-HiLink clComment	Comment
-HiLink clProcedure	Procedure
-HiLink clBreak		Procedure
-HiLink clInclude	Include
-HiLink clSetOption	Statement
-HiLink clSet		Identifier
-HiLink clPreProc	PreProc
-HiLink clOperator	Operator
-HiLink clNumber		Number
-HiLink clString		String
-HiLink clQuote		Delimiter
-HiLink clReserved	Identifier
-HiLink clFunction	Function
-HiLink clStatement	Statement
+hi def link clifError	Error
+hi def link clSpaceError	Error
+hi def link clWhile		Repeat
+hi def link clConditional	Conditional
+hi def link clDebug		Debug
+hi def link clNeedsWork	Todo
+hi def link clTodo		Todo
+hi def link clComment	Comment
+hi def link clProcedure	Procedure
+hi def link clBreak		Procedure
+hi def link clInclude	Include
+hi def link clSetOption	Statement
+hi def link clSet		Identifier
+hi def link clPreProc	PreProc
+hi def link clOperator	Operator
+hi def link clNumber		Number
+hi def link clString		String
+hi def link clQuote		Delimiter
+hi def link clReserved	Identifier
+hi def link clFunction	Function
+hi def link clStatement	Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cl"
 
diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim
--- a/runtime/syntax/clean.vim
+++ b/runtime/syntax/clean.vim
@@ -50,40 +50,38 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
  " Comments
- HiLink cleanComment      Comment
+ hi def link cleanComment      Comment
  " Constants and denotations
- HiLink cleanStringDenot  String
- HiLink cleanCharDenot    Character
- HiLink cleanIntegerDenot Number
- HiLink cleanBoolDenot    Boolean
- HiLink cleanRealDenot    Float
+ hi def link cleanStringDenot  String
+ hi def link cleanCharDenot    Character
+ hi def link cleanIntegerDenot Number
+ hi def link cleanBoolDenot    Boolean
+ hi def link cleanRealDenot    Float
  " Identifiers
  " Statements
- HiLink cleanTypeClass    Keyword
- HiLink cleanConditional  Conditional
- HiLink cleanLabel		Label
- HiLink cleanKeyword      Keyword
+ hi def link cleanTypeClass    Keyword
+ hi def link cleanConditional  Conditional
+ hi def link cleanLabel		Label
+ hi def link cleanKeyword      Keyword
  " Generic Preprocessing
- HiLink cleanIncludeKeyword      Include
- HiLink cleanModuleSystem PreProc
+ hi def link cleanIncludeKeyword      Include
+ hi def link cleanModuleSystem PreProc
  " Type
- HiLink cleanBasicType    Type
- HiLink cleanSpecialType  Type
- HiLink cleanFuncTypeDef  Typedef
+ hi def link cleanBasicType    Type
+ hi def link cleanSpecialType  Type
+ hi def link cleanFuncTypeDef  Typedef
  " Special
- HiLink cleanSpecial      Special
- HiLink cleanList			Special
- HiLink cleanArray		Special
- HiLink cleanRecord		Special
- HiLink cleanTuple		Special
+ hi def link cleanSpecial      Special
+ hi def link cleanList			Special
+ hi def link cleanArray		Special
+ hi def link cleanRecord		Special
+ hi def link cleanTuple		Special
  " Error
  " Todo
- HiLink cleanTodo         Todo
+ hi def link cleanTodo         Todo
 
-delcommand HiLink
 
 let b:current_syntax = "clean"
 
diff --git a/runtime/syntax/clipper.vim b/runtime/syntax/clipper.vim
--- a/runtime/syntax/clipper.vim
+++ b/runtime/syntax/clipper.vim
@@ -112,23 +112,21 @@ syntax match clipperComment		"^\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink clipperConditional		Conditional
-HiLink clipperRepeat			Repeat
-HiLink clipperNumber			Number
-HiLink clipperInclude		Include
-HiLink clipperComment		Comment
-HiLink clipperOperator		Operator
-HiLink clipperStorageClass		StorageClass
-HiLink clipperStatement		Statement
-HiLink clipperString			String
-HiLink clipperFunction		Function
-HiLink clipperLineContinuation	Special
-HiLink clipperDelimiters		Delimiter
-HiLink clipperUserVariable		Identifier
+hi def link clipperConditional		Conditional
+hi def link clipperRepeat			Repeat
+hi def link clipperNumber			Number
+hi def link clipperInclude		Include
+hi def link clipperComment		Comment
+hi def link clipperOperator		Operator
+hi def link clipperStorageClass		StorageClass
+hi def link clipperStatement		Statement
+hi def link clipperString			String
+hi def link clipperFunction		Function
+hi def link clipperLineContinuation	Special
+hi def link clipperDelimiters		Delimiter
+hi def link clipperUserVariable		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "clipper"
 
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -50,23 +50,21 @@ syn keyword cmakeTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cmakeStatement Statement
-HiLink cmakeComment Comment
-HiLink cmakeString String
-HiLink cmakeVariableValue Type
-HiLink cmakeRegistry Underlined
-HiLink cmakeArguments Identifier
-HiLink cmakeArgument Constant
-HiLink cmakeEnvironment Special
-HiLink cmakeOperators Operator
-HiLink cmakeMacro PreProc
-HiLink cmakeError Error
-HiLink cmakeTodo TODO
-HiLink cmakeEscaped Special
+hi def link cmakeStatement Statement
+hi def link cmakeComment Comment
+hi def link cmakeString String
+hi def link cmakeVariableValue Type
+hi def link cmakeRegistry Underlined
+hi def link cmakeArguments Identifier
+hi def link cmakeArgument Constant
+hi def link cmakeEnvironment Special
+hi def link cmakeOperators Operator
+hi def link cmakeMacro PreProc
+hi def link cmakeError Error
+hi def link cmakeTodo TODO
+hi def link cmakeEscaped Special
 
-delcommand HiLink
 
 let b:current_syntax = "cmake"
 
diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim
--- a/runtime/syntax/cobol.vim
+++ b/runtime/syntax/cobol.vim
@@ -151,43 +151,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cobolBAD      Error
-HiLink cobolBadID    Error
-HiLink cobolBadLine  Error
+hi def link cobolBAD      Error
+hi def link cobolBadID    Error
+hi def link cobolBadLine  Error
 if exists("g:cobol_legacy_code")
-    HiLink cobolMarker   Comment
+    hi def link cobolMarker   Comment
 else
-    HiLink cobolMarker   Error
+    hi def link cobolMarker   Error
 endif
-HiLink cobolCALLs    Function
-HiLink cobolComment  Comment
-HiLink cobolKeys     Comment
-HiLink cobolAreaB    Special
-HiLink cobolCompiler PreProc
-HiLink cobolCondFlow Special
-HiLink cobolCopy     PreProc
-HiLink cobolDeclA    cobolDecl
-HiLink cobolDecl     Type
-HiLink cobolExtras   Special
-HiLink cobolGoTo     Special
-HiLink cobolConstant Constant
-HiLink cobolNumber   Constant
-HiLink cobolPic      Constant
-HiLink cobolReserved Statement
-HiLink cobolDivision Label
-HiLink cobolSection  Label
-HiLink cobolParagraph Label
-HiLink cobolDivisionName  Keyword
-HiLink cobolSectionName   Keyword
-HiLink cobolParagraphName Keyword
-HiLink cobolString   Constant
-HiLink cobolTodo     Todo
-HiLink cobolWatch    Special
-HiLink cobolIndicator Special
+hi def link cobolCALLs    Function
+hi def link cobolComment  Comment
+hi def link cobolKeys     Comment
+hi def link cobolAreaB    Special
+hi def link cobolCompiler PreProc
+hi def link cobolCondFlow Special
+hi def link cobolCopy     PreProc
+hi def link cobolDeclA    cobolDecl
+hi def link cobolDecl     Type
+hi def link cobolExtras   Special
+hi def link cobolGoTo     Special
+hi def link cobolConstant Constant
+hi def link cobolNumber   Constant
+hi def link cobolPic      Constant
+hi def link cobolReserved Statement
+hi def link cobolDivision Label
+hi def link cobolSection  Label
+hi def link cobolParagraph Label
+hi def link cobolDivisionName  Keyword
+hi def link cobolSectionName   Keyword
+hi def link cobolParagraphName Keyword
+hi def link cobolString   Constant
+hi def link cobolTodo     Todo
+hi def link cobolWatch    Special
+hi def link cobolIndicator Special
 
-delcommand HiLink
 
 let b:current_syntax = "cobol"
 
diff --git a/runtime/syntax/config.vim b/runtime/syntax/config.vim
--- a/runtime/syntax/config.vim
+++ b/runtime/syntax/config.vim
@@ -35,19 +35,17 @@ syn region  configstring matchgroup=conf
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink configdelimiter Delimiter
-HiLink configoperator  Operator
-HiLink configcomment   Comment
-HiLink configDnl  	 Comment
-HiLink configfunction  Function
-HiLink confignumber    Number
-HiLink configkeyword   Keyword
-HiLink configspecial   Special
-HiLink configstring    String
+hi def link configdelimiter Delimiter
+hi def link configoperator  Operator
+hi def link configcomment   Comment
+hi def link configDnl  	 Comment
+hi def link configfunction  Function
+hi def link confignumber    Number
+hi def link configkeyword   Keyword
+hi def link configspecial   Special
+hi def link configstring    String
 
-delcommand HiLink
 
 let b:current_syntax = "config"
 
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -53,22 +53,20 @@ endif
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink cppAccess		cppStatement
-HiLink cppCast		cppStatement
-HiLink cppExceptions		Exception
-HiLink cppOperator		Operator
-HiLink cppStatement		Statement
-HiLink cppModifier		Type
-HiLink cppType		Type
-HiLink cppStorageClass	StorageClass
-HiLink cppStructure		Structure
-HiLink cppBoolean		Boolean
-HiLink cppConstant		Constant
-HiLink cppRawStringDelimiter	Delimiter
-HiLink cppRawString		String
-HiLink cppNumber		Number
-delcommand HiLink
+hi def link cppAccess		cppStatement
+hi def link cppCast		cppStatement
+hi def link cppExceptions		Exception
+hi def link cppOperator		Operator
+hi def link cppStatement		Statement
+hi def link cppModifier		Type
+hi def link cppType		Type
+hi def link cppStorageClass	StorageClass
+hi def link cppStructure		Structure
+hi def link cppBoolean		Boolean
+hi def link cppConstant		Constant
+hi def link cppRawStringDelimiter	Delimiter
+hi def link cppRawString		String
+hi def link cppNumber		Number
 
 let b:current_syntax = "cpp"
 
diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -37,32 +37,30 @@ syntax match crontabPercent "[^\\]%.*"lc
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink crontabMin		Number
-HiLink crontabHr		PreProc
-HiLink crontabDay		Type
+hi def link crontabMin		Number
+hi def link crontabHr		PreProc
+hi def link crontabDay		Type
 
-HiLink crontabMnth		Number
-HiLink crontabMnth12		Number
-HiLink crontabMnthS		Number
-HiLink crontabMnthN		Number
+hi def link crontabMnth		Number
+hi def link crontabMnth12		Number
+hi def link crontabMnthS		Number
+hi def link crontabMnthN		Number
 
-HiLink crontabDow		PreProc
-HiLink crontabDow7		PreProc
-HiLink crontabDowS		PreProc
-HiLink crontabDowN		PreProc
+hi def link crontabDow		PreProc
+hi def link crontabDow7		PreProc
+hi def link crontabDowS		PreProc
+hi def link crontabDowN		PreProc
 
-HiLink crontabNick		Special
-HiLink crontabVar		Identifier
-HiLink crontabPercent		Special
+hi def link crontabNick		Special
+hi def link crontabVar		Identifier
+hi def link crontabPercent		Special
 
 " comment out next line for to suppress unix commands coloring.
-HiLink crontabCmd		Statement
+hi def link crontabCmd		Statement
 
-HiLink crontabCmnt		Comment
+hi def link crontabCmnt		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "crontab"
 
diff --git a/runtime/syntax/csc.vim b/runtime/syntax/csc.vim
--- a/runtime/syntax/csc.vim
+++ b/runtime/syntax/csc.vim
@@ -156,35 +156,33 @@ exec "sy sync ccomment cscComment minlin
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
 
-HiLink	cscNumber	Number
-HiLink	cscOctal	Number
-HiLink	cscFloat	Float
-HiLink	cscParenE	Error
-HiLink	cscCommentE	Error
-HiLink	cscSpaceE	Error
-HiLink	cscError	Error
-HiLink	cscString	String
-HiLink	cscComment	Comment
-HiLink	cscTodo		Todo
-HiLink	cscStatement	Statement
-HiLink	cscIfError	Error
-HiLink	cscEqError	Error
-HiLink	cscFunction	Statement
-HiLink	cscCondition	Statement
-HiLink	cscWarn		WarningMsg
+hi def link cscNumber	Number
+hi def link cscOctal	Number
+hi def link cscFloat	Float
+hi def link cscParenE	Error
+hi def link cscCommentE	Error
+hi def link cscSpaceE	Error
+hi def link cscError	Error
+hi def link cscString	String
+hi def link cscComment	Comment
+hi def link cscTodo		Todo
+hi def link cscStatement	Statement
+hi def link cscIfError	Error
+hi def link cscEqError	Error
+hi def link cscFunction	Statement
+hi def link cscCondition	Statement
+hi def link cscWarn		WarningMsg
 
-HiLink	cscComE	Error
-HiLink	cscCom	Statement
-HiLink	cscComW	WarningMsg
+hi def link cscComE	Error
+hi def link cscCom	Statement
+hi def link cscComW	WarningMsg
 
-HiLink	cscBPMacro	Identifier
-HiLink	cscBPW		WarningMsg
+hi def link cscBPMacro	Identifier
+hi def link cscBPW		WarningMsg
 
-delcommand HiLink
 
 let b:current_syntax = "csc"
 
diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim
--- a/runtime/syntax/csh.vim
+++ b/runtime/syntax/csh.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	C-shell (csh)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	11
+" Last Change:	Aug 31, 2016
+" Version:	13
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH
 
 " quit when a syntax file was already loaded
@@ -100,44 +100,43 @@ syn match cshNumber	"-\=\<\d\+\>"
 syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_csh_syntax_inits")
 
-HiLink cshArgv		cshVariables
-HiLink cshBckQuote	cshCommand
-HiLink cshDblQuote	cshString
-HiLink cshExtVar	cshVariables
-HiLink cshHereDoc	cshString
-HiLink cshNoEndlineBQ	cshNoEndline
-HiLink cshNoEndlineDQ	cshNoEndline
-HiLink cshNoEndlineSQ	cshNoEndline
-HiLink cshQtyWord	cshVariables
-HiLink cshRedir		cshOperator
-HiLink cshSelector	cshVariables
-HiLink cshSetStmt	cshStatement
-HiLink cshSetVariables	cshVariables
-HiLink cshSnglQuote	cshString
-HiLink cshSubst		cshVariables
+  hi def link cshArgv		cshVariables
+  hi def link cshBckQuote	cshCommand
+  hi def link cshDblQuote	cshString
+  hi def link cshExtVar	cshVariables
+  hi def link cshHereDoc	cshString
+  hi def link cshNoEndlineBQ	cshNoEndline
+  hi def link cshNoEndlineDQ	cshNoEndline
+  hi def link cshNoEndlineSQ	cshNoEndline
+  hi def link cshQtyWord	cshVariables
+  hi def link cshRedir		cshOperator
+  hi def link cshSelector	cshVariables
+  hi def link cshSetStmt	cshStatement
+  hi def link cshSetVariables	cshVariables
+  hi def link cshSnglQuote	cshString
+  hi def link cshSubst		cshVariables
 
-HiLink cshCommand	Statement
-HiLink cshComment	Comment
-HiLink cshConditional	Conditional
-HiLink cshIdentifier	Error
-HiLink cshModifier	Special
-HiLink cshNoEndline	Error
-HiLink cshNumber	Number
-HiLink cshOperator	Operator
-HiLink cshRedir		Statement
-HiLink cshRepeat	Repeat
-HiLink cshShellVariables	Special
-HiLink cshSpecial	Special
-HiLink cshStatement	Statement
-HiLink cshString	String
-HiLink cshSubstError	Error
-HiLink cshTodo		Todo
-HiLink cshVariables	Type
+  hi def link cshCommand	Statement
+  hi def link cshComment	Comment
+  hi def link cshConditional	Conditional
+  hi def link cshIdentifier	Error
+  hi def link cshModifier	Special
+  hi def link cshNoEndline	Error
+  hi def link cshNumber	Number
+  hi def link cshOperator	Operator
+  hi def link cshRedir		Statement
+  hi def link cshRepeat	Repeat
+  hi def link cshShellVariables	Special
+  hi def link cshSpecial	Special
+  hi def link cshStatement	Statement
+  hi def link cshString	String
+  hi def link cshSubstError	Error
+  hi def link cshTodo		Todo
+  hi def link cshVariables	Type
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "csh"
 
diff --git a/runtime/syntax/csp.vim b/runtime/syntax/csp.vim
--- a/runtime/syntax/csp.vim
+++ b/runtime/syntax/csp.vim
@@ -147,37 +147,35 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " (For vim version <=5.7, the command groups are defined in
 " $VIMRUNTIME/syntax/synload.vim )
-HiLink cspComment			Comment
-HiLink cspNumber			Number
-HiLink cspConditional			Conditional
-HiLink cspOperator			Delimiter
-HiLink cspKeyword			Keyword
-HiLink cspReserved			SpecialChar
-HiLink cspInclude			Error
-HiLink cspIncludeKeyword		Include
-HiLink cspIncludeArg			Include
-HiLink cspAssert			PreCondit
-HiLink cspType			Type
-HiLink cspProcess			Function
-HiLink cspTodo			Todo
-HiLink cspOldRttComment		Define
-HiLink cspRttPragmaKeyword		Define
-HiLink cspSdlRttComment		Define
-HiLink cspRttPragmaArg		Define
-HiLink cspRttPragmaSdlArg		Define
-HiLink cspRttPragmaSdlName		Default
-HiLink cspRttPragmaSdlTailArg		Define
-HiLink cspRttPragmaSdlTransName	Default
-HiLink cspRttPragmaSdlTransTailArg	Define
-HiLink cspReservedIdentifier	Error
+hi def link cspComment			Comment
+hi def link cspNumber			Number
+hi def link cspConditional			Conditional
+hi def link cspOperator			Delimiter
+hi def link cspKeyword			Keyword
+hi def link cspReserved			SpecialChar
+hi def link cspInclude			Error
+hi def link cspIncludeKeyword		Include
+hi def link cspIncludeArg			Include
+hi def link cspAssert			PreCondit
+hi def link cspType			Type
+hi def link cspProcess			Function
+hi def link cspTodo			Todo
+hi def link cspOldRttComment		Define
+hi def link cspRttPragmaKeyword		Define
+hi def link cspSdlRttComment		Define
+hi def link cspRttPragmaArg		Define
+hi def link cspRttPragmaSdlArg		Define
+hi def link cspRttPragmaSdlName		Default
+hi def link cspRttPragmaSdlTailArg		Define
+hi def link cspRttPragmaSdlTransName	Default
+hi def link cspRttPragmaSdlTransTailArg	Define
+hi def link cspReservedIdentifier	Error
 " (Currently unused vim method: Debug)
 
-delcommand HiLink
 
 let b:current_syntax = "csp"
 
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -514,130 +514,128 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cssComment Comment
-HiLink cssVendor Comment
-HiLink cssHacks Comment
-HiLink cssTagName Statement
-HiLink cssDeprecated Error
-HiLink cssSelectorOp Special
-HiLink cssSelectorOp2 Special
-HiLink cssAttrComma Special
+hi def link cssComment Comment
+hi def link cssVendor Comment
+hi def link cssHacks Comment
+hi def link cssTagName Statement
+hi def link cssDeprecated Error
+hi def link cssSelectorOp Special
+hi def link cssSelectorOp2 Special
+hi def link cssAttrComma Special
 
-HiLink cssAnimationProp cssProp
-HiLink cssBackgroundProp cssProp
-HiLink cssBorderProp cssProp
-HiLink cssBoxProp cssProp
-HiLink cssColorProp cssProp
-HiLink cssContentForPagedMediaProp cssProp
-HiLink cssDimensionProp cssProp
-HiLink cssFlexibleBoxProp cssProp
-HiLink cssFontProp cssProp
-HiLink cssGeneratedContentProp cssProp
-HiLink cssGridProp cssProp
-HiLink cssHyerlinkProp cssProp
-HiLink cssLineboxProp cssProp
-HiLink cssListProp cssProp
-HiLink cssMarqueeProp cssProp
-HiLink cssMultiColumnProp cssProp
-HiLink cssPagedMediaProp cssProp
-HiLink cssPositioningProp cssProp
-HiLink cssPrintProp cssProp
-HiLink cssRubyProp cssProp
-HiLink cssSpeechProp cssProp
-HiLink cssTableProp cssProp
-HiLink cssTextProp cssProp
-HiLink cssTransformProp cssProp
-HiLink cssTransitionProp cssProp
-HiLink cssUIProp cssProp
-HiLink cssIEUIProp cssProp
-HiLink cssAuralProp cssProp
-HiLink cssRenderProp cssProp
-HiLink cssMobileTextProp cssProp
+hi def link cssAnimationProp cssProp
+hi def link cssBackgroundProp cssProp
+hi def link cssBorderProp cssProp
+hi def link cssBoxProp cssProp
+hi def link cssColorProp cssProp
+hi def link cssContentForPagedMediaProp cssProp
+hi def link cssDimensionProp cssProp
+hi def link cssFlexibleBoxProp cssProp
+hi def link cssFontProp cssProp
+hi def link cssGeneratedContentProp cssProp
+hi def link cssGridProp cssProp
+hi def link cssHyerlinkProp cssProp
+hi def link cssLineboxProp cssProp
+hi def link cssListProp cssProp
+hi def link cssMarqueeProp cssProp
+hi def link cssMultiColumnProp cssProp
+hi def link cssPagedMediaProp cssProp
+hi def link cssPositioningProp cssProp
+hi def link cssPrintProp cssProp
+hi def link cssRubyProp cssProp
+hi def link cssSpeechProp cssProp
+hi def link cssTableProp cssProp
+hi def link cssTextProp cssProp
+hi def link cssTransformProp cssProp
+hi def link cssTransitionProp cssProp
+hi def link cssUIProp cssProp
+hi def link cssIEUIProp cssProp
+hi def link cssAuralProp cssProp
+hi def link cssRenderProp cssProp
+hi def link cssMobileTextProp cssProp
 
-HiLink cssAnimationAttr cssAttr
-HiLink cssBackgroundAttr cssAttr
-HiLink cssBorderAttr cssAttr
-HiLink cssBoxAttr cssAttr
-HiLink cssContentForPagedMediaAttr cssAttr
-HiLink cssDimensionAttr cssAttr
-HiLink cssFlexibleBoxAttr cssAttr
-HiLink cssFontAttr cssAttr
-HiLink cssGeneratedContentAttr cssAttr
-HiLink cssGridAttr cssAttr
-HiLink cssHyerlinkAttr cssAttr
-HiLink cssLineboxAttr cssAttr
-HiLink cssListAttr cssAttr
-HiLink cssMarginAttr cssAttr
-HiLink cssMarqueeAttr cssAttr
-HiLink cssMultiColumnAttr cssAttr
-HiLink cssPaddingAttr cssAttr
-HiLink cssPagedMediaAttr cssAttr
-HiLink cssPositioningAttr cssAttr
-HiLink cssGradientAttr cssAttr
-HiLink cssPrintAttr cssAttr
-HiLink cssRubyAttr cssAttr
-HiLink cssSpeechAttr cssAttr
-HiLink cssTableAttr cssAttr
-HiLink cssTextAttr cssAttr
-HiLink cssTransformAttr cssAttr
-HiLink cssTransitionAttr cssAttr
-HiLink cssUIAttr cssAttr
-HiLink cssIEUIAttr cssAttr
-HiLink cssAuralAttr cssAttr
-HiLink cssRenderAttr cssAttr
-HiLink cssCommonAttr cssAttr
+hi def link cssAnimationAttr cssAttr
+hi def link cssBackgroundAttr cssAttr
+hi def link cssBorderAttr cssAttr
+hi def link cssBoxAttr cssAttr
+hi def link cssContentForPagedMediaAttr cssAttr
+hi def link cssDimensionAttr cssAttr
+hi def link cssFlexibleBoxAttr cssAttr
+hi def link cssFontAttr cssAttr
+hi def link cssGeneratedContentAttr cssAttr
+hi def link cssGridAttr cssAttr
+hi def link cssHyerlinkAttr cssAttr
+hi def link cssLineboxAttr cssAttr
+hi def link cssListAttr cssAttr
+hi def link cssMarginAttr cssAttr
+hi def link cssMarqueeAttr cssAttr
+hi def link cssMultiColumnAttr cssAttr
+hi def link cssPaddingAttr cssAttr
+hi def link cssPagedMediaAttr cssAttr
+hi def link cssPositioningAttr cssAttr
+hi def link cssGradientAttr cssAttr
+hi def link cssPrintAttr cssAttr
+hi def link cssRubyAttr cssAttr
+hi def link cssSpeechAttr cssAttr
+hi def link cssTableAttr cssAttr
+hi def link cssTextAttr cssAttr
+hi def link cssTransformAttr cssAttr
+hi def link cssTransitionAttr cssAttr
+hi def link cssUIAttr cssAttr
+hi def link cssIEUIAttr cssAttr
+hi def link cssAuralAttr cssAttr
+hi def link cssRenderAttr cssAttr
+hi def link cssCommonAttr cssAttr
 
-HiLink cssPseudoClassId PreProc
-HiLink cssPseudoClassLang Constant
-HiLink cssValueLength Number
-HiLink cssValueInteger Number
-HiLink cssValueNumber Number
-HiLink cssValueAngle Number
-HiLink cssValueTime Number
-HiLink cssValueFrequency Number
-HiLink cssFunction Constant
-HiLink cssURL String
-HiLink cssFunctionName Function
-HiLink cssFunctionComma Function
-HiLink cssColor Constant
-HiLink cssIdentifier Function
-HiLink cssInclude Include
-HiLink cssIncludeKeyword atKeyword
-HiLink cssImportant Special
-HiLink cssBraces Function
-HiLink cssBraceError Error
-HiLink cssError Error
-HiLink cssUnicodeEscape Special
-HiLink cssStringQQ String
-HiLink cssStringQ String
-HiLink cssAttributeSelector String
-HiLink cssMedia atKeyword
-HiLink cssMediaType Special
-HiLink cssMediaComma Normal
-HiLink cssMediaKeyword Statement
-HiLink cssMediaProp cssProp
-HiLink cssMediaAttr cssAttr
-HiLink cssPage atKeyword
-HiLink cssPagePseudo PreProc
-HiLink cssPageMargin atKeyword
-HiLink cssPageProp cssProp
-HiLink cssKeyFrame atKeyword
-HiLink cssKeyFrameSelector Constant
-HiLink cssFontDescriptor Special
-HiLink cssFontDescriptorFunction Constant
-HiLink cssFontDescriptorProp cssProp
-HiLink cssFontDescriptorAttr cssAttr
-HiLink cssUnicodeRange Constant
-HiLink cssClassName Function
-HiLink cssClassNameDot Function
-HiLink cssProp StorageClass
-HiLink cssAttr Constant
-HiLink cssUnitDecorators Number
-HiLink cssNoise Noise
-HiLink atKeyword PreProc
-delcommand HiLink
+hi def link cssPseudoClassId PreProc
+hi def link cssPseudoClassLang Constant
+hi def link cssValueLength Number
+hi def link cssValueInteger Number
+hi def link cssValueNumber Number
+hi def link cssValueAngle Number
+hi def link cssValueTime Number
+hi def link cssValueFrequency Number
+hi def link cssFunction Constant
+hi def link cssURL String
+hi def link cssFunctionName Function
+hi def link cssFunctionComma Function
+hi def link cssColor Constant
+hi def link cssIdentifier Function
+hi def link cssInclude Include
+hi def link cssIncludeKeyword atKeyword
+hi def link cssImportant Special
+hi def link cssBraces Function
+hi def link cssBraceError Error
+hi def link cssError Error
+hi def link cssUnicodeEscape Special
+hi def link cssStringQQ String
+hi def link cssStringQ String
+hi def link cssAttributeSelector String
+hi def link cssMedia atKeyword
+hi def link cssMediaType Special
+hi def link cssMediaComma Normal
+hi def link cssMediaKeyword Statement
+hi def link cssMediaProp cssProp
+hi def link cssMediaAttr cssAttr
+hi def link cssPage atKeyword
+hi def link cssPagePseudo PreProc
+hi def link cssPageMargin atKeyword
+hi def link cssPageProp cssProp
+hi def link cssKeyFrame atKeyword
+hi def link cssKeyFrameSelector Constant
+hi def link cssFontDescriptor Special
+hi def link cssFontDescriptorFunction Constant
+hi def link cssFontDescriptorProp cssProp
+hi def link cssFontDescriptorAttr cssAttr
+hi def link cssUnicodeRange Constant
+hi def link cssClassName Function
+hi def link cssClassNameDot Function
+hi def link cssProp StorageClass
+hi def link cssAttr Constant
+hi def link cssUnitDecorators Number
+hi def link cssNoise Noise
+hi def link atKeyword PreProc
 
 let b:current_syntax = "css"
 
diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim
--- a/runtime/syntax/cterm.vim
+++ b/runtime/syntax/cterm.vim
@@ -140,39 +140,37 @@ syn match   ctermSpecialCharacter	"'\\.'
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ctermStatement		Statement
-HiLink ctermFunction		Statement
-HiLink ctermStrFunction	Statement
-HiLink ctermIntFunction	Statement
-HiLink ctermLabel		Statement
-HiLink ctermConditional	Statement
-HiLink ctermRepeat		Statement
-HiLink ctermLibFunc		UserDefFunc
-HiLink ctermType		Type
-HiLink ctermFuncArg		PreCondit
+hi def link ctermStatement		Statement
+hi def link ctermFunction		Statement
+hi def link ctermStrFunction	Statement
+hi def link ctermIntFunction	Statement
+hi def link ctermLabel		Statement
+hi def link ctermConditional	Statement
+hi def link ctermRepeat		Statement
+hi def link ctermLibFunc		UserDefFunc
+hi def link ctermType		Type
+hi def link ctermFuncArg		PreCondit
 
-HiLink ctermPreVarRO		PreCondit
-HiLink ctermPreVarRW		PreConditBold
-HiLink ctermVar		Type
+hi def link ctermPreVarRO		PreCondit
+hi def link ctermPreVarRW		PreConditBold
+hi def link ctermVar		Type
 
-HiLink ctermComment		Comment
+hi def link ctermComment		Comment
 
-HiLink ctermCharacter		SpecialChar
-HiLink ctermSpecial		Special
-HiLink ctermSpecialCharacter	SpecialChar
-HiLink ctermSymbols		Special
-HiLink ctermString		String
-HiLink ctermTodo		Todo
-HiLink ctermOperator		Statement
-HiLink ctermNumber		Number
+hi def link ctermCharacter		SpecialChar
+hi def link ctermSpecial		Special
+hi def link ctermSpecialCharacter	SpecialChar
+hi def link ctermSymbols		Special
+hi def link ctermString		String
+hi def link ctermTodo		Todo
+hi def link ctermOperator		Statement
+hi def link ctermNumber		Number
 
 " redefine the colors
 "hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
 "hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
 
-delcommand HiLink
 
 let b:current_syntax = "cterm"
 
diff --git a/runtime/syntax/cupl.vim b/runtime/syntax/cupl.vim
--- a/runtime/syntax/cupl.vim
+++ b/runtime/syntax/cupl.vim
@@ -93,30 +93,28 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink cuplHeader	cuplStatement
-HiLink cuplLogicalOperator	 cuplOperator
-HiLink cuplRangeOperator	 cuplOperator
-HiLink cuplArithmeticOperator cuplOperator
-HiLink cuplAssignmentOperator cuplOperator
-HiLink cuplEqualityOperator	 cuplOperator
-HiLink cuplTruthTableOperator cuplOperator
-HiLink cuplOperator	cuplStatement
-HiLink cuplFunction	cuplStatement
-HiLink cuplStatement Statement
-HiLink cuplNumberRange cuplNumber
-HiLink cuplNumber	  cuplString
-HiLink cuplString	String
-HiLink cuplComment	Comment
-HiLink cuplExtension   cuplSpecial
-HiLink cuplSpecialChar cuplSpecial
-HiLink cuplSpecial	Special
-HiLink cuplDirective PreProc
-HiLink cuplTodo	Todo
+hi def link cuplHeader	cuplStatement
+hi def link cuplLogicalOperator	 cuplOperator
+hi def link cuplRangeOperator	 cuplOperator
+hi def link cuplArithmeticOperator cuplOperator
+hi def link cuplAssignmentOperator cuplOperator
+hi def link cuplEqualityOperator	 cuplOperator
+hi def link cuplTruthTableOperator cuplOperator
+hi def link cuplOperator	cuplStatement
+hi def link cuplFunction	cuplStatement
+hi def link cuplStatement Statement
+hi def link cuplNumberRange cuplNumber
+hi def link cuplNumber	  cuplString
+hi def link cuplString	String
+hi def link cuplComment	Comment
+hi def link cuplExtension   cuplSpecial
+hi def link cuplSpecialChar cuplSpecial
+hi def link cuplSpecial	Special
+hi def link cuplDirective PreProc
+hi def link cuplTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "cupl"
 
diff --git a/runtime/syntax/cuplsim.vim b/runtime/syntax/cuplsim.vim
--- a/runtime/syntax/cuplsim.vim
+++ b/runtime/syntax/cuplsim.vim
@@ -47,19 +47,17 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " append to the highlighting links in cupl.vim
 " The default highlighting.
-HiLink cuplsimOrder		cuplStatement
-HiLink cuplsimBase		cuplStatement
-HiLink cuplsimBaseType	cuplStatement
-HiLink cuplsimVectors		cuplStatement
-HiLink cuplsimStimulus	cuplNumber
-HiLink cuplsimOutput		cuplNumber
-HiLink cuplsimOrderFormat	cuplNumber
+hi def link cuplsimOrder		cuplStatement
+hi def link cuplsimBase		cuplStatement
+hi def link cuplsimBaseType	cuplStatement
+hi def link cuplsimVectors		cuplStatement
+hi def link cuplsimStimulus	cuplNumber
+hi def link cuplsimOutput		cuplNumber
+hi def link cuplsimOrderFormat	cuplNumber
 
-delcommand HiLink
 
 let b:current_syntax = "cuplsim"
 " vim:ts=8
diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -18,15 +18,13 @@ syn match cvsDir   contained "\S\+$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cvsLine		Comment
-HiLink cvsDir		cvsFile
-HiLink cvsFile		Constant
-HiLink cvsFiles		cvsCom
-HiLink cvsTag		cvsCom
-HiLink cvsCom		Statement
+hi def link cvsLine		Comment
+hi def link cvsDir		cvsFile
+hi def link cvsFile		Constant
+hi def link cvsFiles		cvsCom
+hi def link cvsTag		cvsCom
+hi def link cvsCom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cvs"
diff --git a/runtime/syntax/cweb.vim b/runtime/syntax/cweb.vim
--- a/runtime/syntax/cweb.vim
+++ b/runtime/syntax/cweb.vim
@@ -57,11 +57,9 @@ syntax match webIgnoredStuff "@@"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webRestrictedTeX String
+hi def link webRestrictedTeX String
 
-delcommand HiLink
 
 let b:current_syntax = "cweb"
 
diff --git a/runtime/syntax/cynlib.vim b/runtime/syntax/cynlib.vim
--- a/runtime/syntax/cynlib.vim
+++ b/runtime/syntax/cynlib.vim
@@ -63,14 +63,12 @@ syn keyword	cynlibType	   In Out InST Ou
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cynlibOperator   Operator
-HiLink cynlibMacro      Statement
-HiLink cynlibFunction   Statement
-HiLink cynlibppMacro      Statement
-HiLink cynlibType       Type
+hi def link cynlibOperator   Operator
+hi def link cynlibMacro      Statement
+hi def link cynlibFunction   Statement
+hi def link cynlibppMacro      Statement
+hi def link cynlibType       Type
 
-delcommand HiLink
 
 let b:current_syntax = "cynlib"
diff --git a/runtime/syntax/cynpp.vim b/runtime/syntax/cynpp.vim
--- a/runtime/syntax/cynpp.vim
+++ b/runtime/syntax/cynpp.vim
@@ -42,11 +42,9 @@ syn keyword     cynppMacro      Instanti
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cLabel		Label
-HiLink cynppMacro  Statement
+hi def link cLabel		Label
+hi def link cynppMacro  Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cynpp"
diff --git a/runtime/syntax/dcd.vim b/runtime/syntax/dcd.vim
--- a/runtime/syntax/dcd.vim
+++ b/runtime/syntax/dcd.vim
@@ -38,16 +38,14 @@ syn region  dcdComment		start="\*" end="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dcdFunction		Identifier
-HiLink dcdLabel		Constant
-HiLink dcdConditional		Conditional
-HiLink dcdDisplay		Type
-HiLink dcdStatement		Statement
-HiLink dcdSpecial		Special
-HiLink dcdComment		Comment
+hi def link dcdFunction		Identifier
+hi def link dcdLabel		Constant
+hi def link dcdConditional		Conditional
+hi def link dcdDisplay		Type
+hi def link dcdStatement		Statement
+hi def link dcdSpecial		Special
+hi def link dcdComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "dcd"
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	DCL (Digital Command Language - vms)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	9
+" Last Change:	Aug 31, 2016
+" Version:	11
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
 
 " quit when a syntax file was already loaded
@@ -111,42 +111,41 @@ syn region  dclFuncList	matchgroup=Delim
 syn match   dclError	")"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_dcl_syntax_inits")
 
-HiLink dclLogOper	dclError
-HiLink dclLogical	dclOper
-HiLink dclLogSep	dclSep
+ hi def link dclLogOper	dclError
+ hi def link dclLogical	dclOper
+ hi def link dclLogSep	dclSep
 
-HiLink dclAssign	Operator
-HiLink dclCmdProc	Special
-HiLink dclCmdProcStart	Operator
-HiLink dclComment	Comment
-HiLink dclContinue	Statement
-HiLink dclDevice	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirSep	Delimiter
-HiLink dclError	Error
-HiLink dclExe		Statement
-HiLink dclFilename	NONE
-HiLink dclGotoLabel	Label
-HiLink dclInstr	Statement
-HiLink dclLexical	Function
-HiLink dclMdfy	Type
-HiLink dclMdfyBrkt	Delimiter
-HiLink dclMdfySep	Delimiter
-HiLink dclMdfySet	Type
-HiLink dclMdfySetString	String
-HiLink dclNumber	Number
-HiLink dclOper	Operator
-HiLink dclParam	Special
-HiLink dclSep		Delimiter
-HiLink dclStart	Delimiter
-HiLink dclString	String
-HiLink dclTodo	Todo
+ hi def link dclAssign	Operator
+ hi def link dclCmdProc	Special
+ hi def link dclCmdProcStart	Operator
+ hi def link dclComment	Comment
+ hi def link dclContinue	Statement
+ hi def link dclDevice	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirSep	Delimiter
+ hi def link dclError	Error
+ hi def link dclExe		Statement
+ hi def link dclFilename	NONE
+ hi def link dclGotoLabel	Label
+ hi def link dclInstr	Statement
+ hi def link dclLexical	Function
+ hi def link dclMdfy	Type
+ hi def link dclMdfyBrkt	Delimiter
+ hi def link dclMdfySep	Delimiter
+ hi def link dclMdfySet	Type
+ hi def link dclMdfySetString	String
+ hi def link dclNumber	Number
+ hi def link dclOper	Operator
+ hi def link dclParam	Special
+ hi def link dclSep		Delimiter
+ hi def link dclStart	Delimiter
+ hi def link dclString	String
+ hi def link dclTodo	Todo
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "dcl"
 
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " 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: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -34,21 +34,17 @@ syn region debchangelogFooter start="^ [
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debchangelogHeader		Error
-HiLink debchangelogFooter		Identifier
-HiLink debchangelogEntry		Normal
-HiLink debchangelogCloses		Statement
-HiLink debchangelogLP			Statement
-HiLink debchangelogFirstKV		Identifier
-HiLink debchangelogOtherKV		Identifier
-HiLink debchangelogName		Comment
-HiLink debchangelogVersion		Identifier
-HiLink debchangelogTarget		Identifier
-HiLink debchangelogEmail		Special
-
-delcommand HiLink
+hi def link debchangelogHeader  Error
+hi def link debchangelogFooter  Identifier
+hi def link debchangelogEntry   Normal
+hi def link debchangelogCloses  Statement
+hi def link debchangelogLP      Statement
+hi def link debchangelogFirstKV Identifier
+hi def link debchangelogOtherKV Identifier
+hi def link debchangelogName    Comment
+hi def link debchangelogVersion Identifier
+hi def link debchangelogTarget  Identifier
+hi def link debchangelogEmail   Special
 
 let b:current_syntax = "debchangelog"
 
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " 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: 2015 Oct 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -26,7 +26,7 @@ syn match debControlSpace " "
 
 let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
 let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
-      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el'
+      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el'
       \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
 let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
 
@@ -84,30 +84,26 @@ syn region debcontrolMultiField start="^
 syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debcontrolKey		Keyword
-HiLink debcontrolField	Normal
-HiLink debcontrolStrictField	Error
-HiLink debcontrolDeprecatedKey	Error
-HiLink debcontrolMultiField	Normal
-HiLink debcontrolArchitecture	Normal
-HiLink debcontrolMultiArch	Normal
-HiLink debcontrolName		Normal
-HiLink debcontrolPriority	Normal
-HiLink debcontrolSection	Normal
-HiLink debcontrolPackageType	Normal
-HiLink debcontrolVariable	Identifier
-HiLink debcontrolEmail	Identifier
-HiLink debcontrolVcsSvn	Identifier
-HiLink debcontrolVcsCvs	Identifier
-HiLink debcontrolVcsGit	Identifier
-HiLink debcontrolHTTPUrl	Identifier
-HiLink debcontrolDmUpload	Identifier
-HiLink debcontrolComment	Comment
-HiLink debcontrolElse		Special
-
-delcommand HiLink
+hi def link debcontrolKey           Keyword
+hi def link debcontrolField         Normal
+hi def link debcontrolStrictField   Error
+hi def link debcontrolDeprecatedKey Error
+hi def link debcontrolMultiField    Normal
+hi def link debcontrolArchitecture  Normal
+hi def link debcontrolMultiArch     Normal
+hi def link debcontrolName          Normal
+hi def link debcontrolPriority      Normal
+hi def link debcontrolSection       Normal
+hi def link debcontrolPackageType   Normal
+hi def link debcontrolVariable      Identifier
+hi def link debcontrolEmail         Identifier
+hi def link debcontrolVcsSvn        Identifier
+hi def link debcontrolVcsCvs        Identifier
+hi def link debcontrolVcsGit        Identifier
+hi def link debcontrolHTTPUrl       Identifier
+hi def link debcontrolDmUpload      Identifier
+hi def link debcontrolComment       Comment
+hi def link debcontrolElse          Special
 
 let b:current_syntax = "debcontrol"
 
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel'
+      \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -34,7 +34,7 @@ let s:unsupported = [
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid'
+      \ 'utopic', 'vivid', 'wily'
       \ ]
 let &cpo=s:cpo
 
diff --git a/runtime/syntax/def.vim b/runtime/syntax/def.vim
--- a/runtime/syntax/def.vim
+++ b/runtime/syntax/def.vim
@@ -30,16 +30,14 @@ syn match   defNumber	"0x\x\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink defComment	Comment
-HiLink defKeyword	Keyword
-HiLink defStorage	StorageClass
-HiLink defString	String
-HiLink defNumber	Number
-HiLink defOrdinal	Operator
+hi def link defComment	Comment
+hi def link defKeyword	Keyword
+hi def link defStorage	StorageClass
+hi def link defString	String
+hi def link defNumber	Number
+hi def link defOrdinal	Operator
 
-delcommand HiLink
 
 let b:current_syntax = "def"
 
diff --git a/runtime/syntax/desc.vim b/runtime/syntax/desc.vim
--- a/runtime/syntax/desc.vim
+++ b/runtime/syntax/desc.vim
@@ -61,30 +61,28 @@ syn region descTagRegion start=/^\[\(F\|
 syn region descTagRegion start=/^\[\(L\|LICENSE\)\]/ end=/$/ contains=descTag,descLicense
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink descFlag		Identifier
-HiLink descLicense		Identifier
-HiLink descCategory		Identifier
+hi def link descFlag		Identifier
+hi def link descLicense		Identifier
+hi def link descCategory		Identifier
 
-HiLink descTag		Type
-HiLink descUrl		Underlined
-HiLink descEmail		Underlined
+hi def link descTag		Type
+hi def link descUrl		Underlined
+hi def link descEmail		Underlined
 
 " priority tag colors
-HiLink descInstallX		Boolean
-HiLink descInstallO		Type
-HiLink descDash		Operator
-HiLink descDigit		Number
-HiLink descCompilePriority	Number
+hi def link descInstallX		Boolean
+hi def link descInstallO		Type
+hi def link descDash		Operator
+hi def link descDigit		Number
+hi def link descCompilePriority	Number
 
 " download tag colors
-HiLink descSum		Number
-HiLink descTarball		Underlined
+hi def link descSum		Number
+hi def link descTarball		Underlined
 
 " tag region colors
-HiLink descText		Comment
+hi def link descText		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "desc"
diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -77,32 +77,30 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtGroup		 Special
-HiLink dtComment	 Comment
-HiLink dtDelim		 String
+hi def link dtGroup		 Special
+hi def link dtComment	 Comment
+hi def link dtDelim		 String
 
-HiLink dtLocaleKey	 Type
-HiLink dtLocaleName	 Identifier
-HiLink dtXLocale	 Identifier
-HiLink dtALocale	 Identifier
+hi def link dtLocaleKey	 Type
+hi def link dtLocaleName	 Identifier
+hi def link dtXLocale	 Identifier
+hi def link dtALocale	 Identifier
 
-HiLink dtNumericKey	 Type
+hi def link dtNumericKey	 Type
 
-HiLink dtBooleanKey	 Type
-HiLink dtBooleanValue	 Constant
+hi def link dtBooleanKey	 Type
+hi def link dtBooleanValue	 Constant
 
-HiLink dtStringKey	 Type
+hi def link dtStringKey	 Type
 
-HiLink dtExecKey	 Type
-HiLink dtExecParam	 Special
-HiLink dtTypeKey	 Type
-HiLink dtTypeValue	 Constant
-HiLink dtNotStLabel	 Type
-HiLink dtXAddKey	 Type
+hi def link dtExecKey	 Type
+hi def link dtExecParam	 Special
+hi def link dtTypeKey	 Type
+hi def link dtTypeValue	 Constant
+hi def link dtNotStLabel	 Type
+hi def link dtXAddKey	 Type
 
-delcommand HiLink
 
 let b:current_syntax = "desktop"
 
diff --git a/runtime/syntax/diva.vim b/runtime/syntax/diva.vim
--- a/runtime/syntax/diva.vim
+++ b/runtime/syntax/diva.vim
@@ -78,20 +78,18 @@ syn match divaGeomFunctions		"\<geom\u\a
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink divaDRCKeywords		Statement
-HiLink divaMeasKeywords		Statement
-HiLink divaCtrlFunctions	Conditional
-HiLink divaExtFunctions		Function
-HiLink divaDRCFunctions		Function
-HiLink divaFunctions		Function
-HiLink divaLayerFunctions	Function
-HiLink divaChkFunctions		Function
-HiLink divaLVSFunctions		Function
-HiLink divaGeomFunctions	Function
+hi def link divaDRCKeywords		Statement
+hi def link divaMeasKeywords		Statement
+hi def link divaCtrlFunctions	Conditional
+hi def link divaExtFunctions		Function
+hi def link divaDRCFunctions		Function
+hi def link divaFunctions		Function
+hi def link divaLayerFunctions	Function
+hi def link divaChkFunctions		Function
+hi def link divaLVSFunctions		Function
+hi def link divaGeomFunctions	Function
 
-delcommand HiLink
 
 let b:current_syntax = "diva"
 
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -66,20 +66,18 @@ syn region djangoComBlock start="{#" end
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink djangoTagBlock PreProc
-HiLink djangoVarBlock PreProc
-HiLink djangoStatement Statement
-HiLink djangoFilter Identifier
-HiLink djangoArgument Constant
-HiLink djangoTagError Error
-HiLink djangoVarError Error
-HiLink djangoError Error
-HiLink djangoComment Comment
-HiLink djangoComBlock Comment
-HiLink djangoTodo Todo
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
 
-delcommand HiLink
 
 let b:current_syntax = "django"
diff --git a/runtime/syntax/docbk.vim b/runtime/syntax/docbk.vim
--- a/runtime/syntax/docbk.vim
+++ b/runtime/syntax/docbk.vim
@@ -172,16 +172,14 @@ syn region docbkCite   start="<citation>
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 hi def DocbkBold term=bold cterm=bold gui=bold
 
-HiLink docbkKeyword	Statement
-HiLink docbkRegion	DocbkBold
-HiLink docbkTitle	Title
-HiLink docbkRemark	Comment
-HiLink docbkCite	Constant
+hi def link docbkKeyword	Statement
+hi def link docbkRegion	DocbkBold
+hi def link docbkTitle	Title
+hi def link docbkRemark	Comment
+hi def link docbkCite	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "docbk"
 
diff --git a/runtime/syntax/dosbatch.vim b/runtime/syntax/dosbatch.vim
--- a/runtime/syntax/dosbatch.vim
+++ b/runtime/syntax/dosbatch.vim
@@ -109,40 +109,38 @@ syn keyword dosbatchImplicit    vol xcop
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosbatchTodo		Todo
+hi def link dosbatchTodo		Todo
 
-HiLink dosbatchStatement	Statement
-HiLink dosbatchCommands	dosbatchStatement
-HiLink dosbatchLabel		Label
-HiLink dosbatchConditional	Conditional
-HiLink dosbatchRepeat		Repeat
+hi def link dosbatchStatement	Statement
+hi def link dosbatchCommands	dosbatchStatement
+hi def link dosbatchLabel		Label
+hi def link dosbatchConditional	Conditional
+hi def link dosbatchRepeat		Repeat
 
-HiLink dosbatchOperator       Operator
-HiLink dosbatchEchoOperator   dosbatchOperator
-HiLink dosbatchIfOperator     dosbatchOperator
+hi def link dosbatchOperator       Operator
+hi def link dosbatchEchoOperator   dosbatchOperator
+hi def link dosbatchIfOperator     dosbatchOperator
 
-HiLink dosbatchArgument	Identifier
-HiLink dosbatchIdentifier     Identifier
-HiLink dosbatchVariable	dosbatchIdentifier
+hi def link dosbatchArgument	Identifier
+hi def link dosbatchIdentifier     Identifier
+hi def link dosbatchVariable	dosbatchIdentifier
 
-HiLink dosbatchSpecialChar	SpecialChar
-HiLink dosbatchString		String
-HiLink dosbatchNumber		Number
-HiLink dosbatchInteger	dosbatchNumber
-HiLink dosbatchHex		dosbatchNumber
-HiLink dosbatchBinary		dosbatchNumber
-HiLink dosbatchOctal		dosbatchNumber
+hi def link dosbatchSpecialChar	SpecialChar
+hi def link dosbatchString		String
+hi def link dosbatchNumber		Number
+hi def link dosbatchInteger	dosbatchNumber
+hi def link dosbatchHex		dosbatchNumber
+hi def link dosbatchBinary		dosbatchNumber
+hi def link dosbatchOctal		dosbatchNumber
 
-HiLink dosbatchComment	Comment
-HiLink dosbatchImplicit	Function
+hi def link dosbatchComment	Comment
+hi def link dosbatchImplicit	Function
 
-HiLink dosbatchSwitch		Special
+hi def link dosbatchSwitch		Special
 
-HiLink dosbatchCmd		PreProc
+hi def link dosbatchCmd		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dosbatch"
 
diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -26,14 +26,12 @@ syn match  dosiniComment  "^[#;].*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosiniNumber   Number
-HiLink dosiniHeader   Special
-HiLink dosiniComment  Comment
-HiLink dosiniLabel    Type
+hi def link dosiniNumber   Number
+hi def link dosiniHeader   Special
+hi def link dosiniComment  Comment
+hi def link dosiniLabel    Type
 
-delcommand HiLink
 
 let b:current_syntax = "dosini"
 
diff --git a/runtime/syntax/dot.vim b/runtime/syntax/dot.vim
--- a/runtime/syntax/dot.vim
+++ b/runtime/syntax/dot.vim
@@ -72,27 +72,25 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dotParErr	 Error
-HiLink dotBraceErr	 Error
-HiLink dotBrackErr	 Error
+hi def link dotParErr	 Error
+hi def link dotBraceErr	 Error
+hi def link dotBrackErr	 Error
 
-HiLink dotComment	 Comment
-HiLink dotTodo	 Todo
+hi def link dotComment	 Comment
+hi def link dotTodo	 Todo
 
-HiLink dotParEncl	 Keyword
-HiLink dotBrackEncl	 Keyword
-HiLink dotBraceEncl	 Keyword
+hi def link dotParEncl	 Keyword
+hi def link dotBrackEncl	 Keyword
+hi def link dotBraceEncl	 Keyword
 
-HiLink dotKeyword	 Keyword
-HiLink dotType	 Type
-HiLink dotKeyChar	 Keyword
+hi def link dotKeyword	 Keyword
+hi def link dotType	 Type
+hi def link dotKeyChar	 Keyword
 
-HiLink dotString	 String
-HiLink dotIdentifier	 Identifier
+hi def link dotString	 String
+hi def link dotIdentifier	 Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dot"
 
diff --git a/runtime/syntax/dracula.vim b/runtime/syntax/dracula.vim
--- a/runtime/syntax/dracula.vim
+++ b/runtime/syntax/dracula.vim
@@ -59,15 +59,13 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink draculaIdentifier Identifier
-HiLink draculaStatement  Statement
-HiLink draculaType       Type
-HiLink draculaComment    Comment
-HiLink draculaPreProc    PreProc
+hi def link draculaIdentifier Identifier
+hi def link draculaStatement  Statement
+hi def link draculaType       Type
+hi def link draculaComment    Comment
+hi def link draculaPreProc    PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dracula"
 
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -127,32 +127,30 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink dtdFunction		Function
-HiLink dtdTag		Normal
-HiLink dtdType		Type
-HiLink dtdAttrType		dtdType
-HiLink dtdAttrDef		dtdType
-HiLink dtdConstant		Constant
-HiLink dtdString		dtdConstant
-HiLink dtdEnum		dtdConstant
-HiLink dtdCard		dtdFunction
+hi def link dtdFunction		Function
+hi def link dtdTag		Normal
+hi def link dtdType		Type
+hi def link dtdAttrType		dtdType
+hi def link dtdAttrDef		dtdType
+hi def link dtdConstant		Constant
+hi def link dtdString		dtdConstant
+hi def link dtdEnum		dtdConstant
+hi def link dtdCard		dtdFunction
 
-HiLink dtdEntity		Statement
-HiLink dtdEntityPunct	dtdType
-HiLink dtdParamEntityInst	dtdConstant
-HiLink dtdParamEntityPunct	dtdType
-HiLink dtdParamEntityDecl	dtdType
-HiLink dtdParamEntityDPunct dtdComment
+hi def link dtdEntity		Statement
+hi def link dtdEntityPunct	dtdType
+hi def link dtdParamEntityInst	dtdConstant
+hi def link dtdParamEntityPunct	dtdType
+hi def link dtdParamEntityDecl	dtdType
+hi def link dtdParamEntityDPunct dtdComment
 
-HiLink dtdComment		Comment
-HiLink dtdTagName		Statement
-HiLink dtdError		Error
-HiLink dtdTodo		Todo
+hi def link dtdComment		Comment
+hi def link dtdTagName		Statement
+hi def link dtdError		Error
+hi def link dtdTodo		Todo
 
-delcommand HiLink
 
 let &cpo = s:dtd_cpo_save
 unlet s:dtd_cpo_save
diff --git a/runtime/syntax/dtml.vim b/runtime/syntax/dtml.vim
--- a/runtime/syntax/dtml.vim
+++ b/runtime/syntax/dtml.vim
@@ -190,16 +190,14 @@ syn match   htmlTagN     contained +</\s
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtmlIsTag			PreProc
-HiLink dtmlAttribute		Identifier
-HiLink dtmlMethod			Function
-HiLink dtmlComment		Comment
-HiLink dtmlTODO			Todo
-HiLink dtmlSpecialChar    Special
+hi def link dtmlIsTag			PreProc
+hi def link dtmlAttribute		Identifier
+hi def link dtmlMethod			Function
+hi def link dtmlComment		Comment
+hi def link dtmlTODO			Todo
+hi def link dtmlSpecialChar    Special
 
-delcommand HiLink
 
 let b:current_syntax = "dtml"
 
diff --git a/runtime/syntax/dylan.vim b/runtime/syntax/dylan.vim
--- a/runtime/syntax/dylan.vim
+++ b/runtime/syntax/dylan.vim
@@ -61,33 +61,31 @@ syn region	dylanHeader	start="^[Mm]odule
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanBlock		PreProc
-HiLink dylanBoolean		Boolean
-HiLink dylanCharacter		Character
-HiLink dylanClass		Structure
-HiLink dylanClassMods		StorageClass
-HiLink dylanComment		Comment
-HiLink dylanConditional	Conditional
-HiLink dylanConstant		Constant
-HiLink dylanException		Exception
-HiLink dylanHeader		Macro
-HiLink dylanImport		Include
-HiLink dylanLabel		Label
-HiLink dylanMiscMods		StorageClass
-HiLink dylanNumber		Number
-HiLink dylanOther		Keyword
-HiLink dylanOperator		Operator
-HiLink dylanParamDefs		Keyword
-HiLink dylanPrecondit		PreCondit
-HiLink dylanRepeat		Repeat
-HiLink dylanSimpleDefs	Keyword
-HiLink dylanStatement		Macro
-HiLink dylanString		String
-HiLink dylanVariable		Identifier
+hi def link dylanBlock		PreProc
+hi def link dylanBoolean		Boolean
+hi def link dylanCharacter		Character
+hi def link dylanClass		Structure
+hi def link dylanClassMods		StorageClass
+hi def link dylanComment		Comment
+hi def link dylanConditional	Conditional
+hi def link dylanConstant		Constant
+hi def link dylanException		Exception
+hi def link dylanHeader		Macro
+hi def link dylanImport		Include
+hi def link dylanLabel		Label
+hi def link dylanMiscMods		StorageClass
+hi def link dylanNumber		Number
+hi def link dylanOther		Keyword
+hi def link dylanOperator		Operator
+hi def link dylanParamDefs		Keyword
+hi def link dylanPrecondit		PreCondit
+hi def link dylanRepeat		Repeat
+hi def link dylanSimpleDefs	Keyword
+hi def link dylanStatement		Macro
+hi def link dylanString		String
+hi def link dylanVariable		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dylan"
 
diff --git a/runtime/syntax/dylanintr.vim b/runtime/syntax/dylanintr.vim
--- a/runtime/syntax/dylanintr.vim
+++ b/runtime/syntax/dylanintr.vim
@@ -24,17 +24,15 @@ syn match	dylanintrInclude	"^\s*#\s*incl
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanintrInfo		Special
-HiLink dylanintrInterface	Operator
-HiLink dylanintrMods		Type
-HiLink dylanintrClass		StorageClass
-HiLink dylanintrType		Type
-HiLink dylanintrIncluded	String
-HiLink dylanintrInclude	Include
+hi def link dylanintrInfo		Special
+hi def link dylanintrInterface	Operator
+hi def link dylanintrMods		Type
+hi def link dylanintrClass		StorageClass
+hi def link dylanintrType		Type
+hi def link dylanintrIncluded	String
+hi def link dylanintrInclude	Include
 
-delcommand HiLink
 
 let b:current_syntax = "dylanintr"
 
diff --git a/runtime/syntax/dylanlid.vim b/runtime/syntax/dylanlid.vim
--- a/runtime/syntax/dylanlid.vim
+++ b/runtime/syntax/dylanlid.vim
@@ -19,12 +19,10 @@ syn sync	lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanlidInfo		Type
-HiLink dylanlidEntry		String
+hi def link dylanlidInfo		Type
+hi def link dylanlidEntry		String
 
-delcommand HiLink
 
 let b:current_syntax = "dylanlid"
 
diff --git a/runtime/syntax/ecd.vim b/runtime/syntax/ecd.vim
--- a/runtime/syntax/ecd.vim
+++ b/runtime/syntax/ecd.vim
@@ -30,17 +30,15 @@ syn match  ecdTagError	contained "[^>]<"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ecdComment	Comment
-HiLink ecdAttr	Type
-HiLink ecdAttrN	Statement
-HiLink ecdAttrV	Value
-HiLink ecdTag		Function
-HiLink ecdTagN	Statement
-HiLink ecdTagError	Error
+hi def link ecdComment	Comment
+hi def link ecdAttr	Type
+hi def link ecdAttrN	Statement
+hi def link ecdAttrV	Value
+hi def link ecdTag		Function
+hi def link ecdTagN	Statement
+hi def link ecdTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "ecd"
 " vim: ts=8
diff --git a/runtime/syntax/edif.vim b/runtime/syntax/edif.vim
--- a/runtime/syntax/edif.vim
+++ b/runtime/syntax/edif.vim
@@ -34,14 +34,12 @@ syn match       edifError       ")"
 syntax sync fromstart
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink edifInString		SpecialChar
-HiLink edifKeyword		Keyword
-HiLink edifNumber		Number
-HiLink edifInStringError	edifError
-HiLink edifError		Error
-HiLink edifString		String
-delcommand HiLink
+hi def link edifInString		SpecialChar
+hi def link edifKeyword		Keyword
+hi def link edifNumber		Number
+hi def link edifInStringError	edifError
+hi def link edifError		Error
+hi def link edifString		String
 
 let b:current_syntax = "edif"
diff --git a/runtime/syntax/eiffel.vim b/runtime/syntax/eiffel.vim
--- a/runtime/syntax/eiffel.vim
+++ b/runtime/syntax/eiffel.vim
@@ -139,59 +139,57 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eiffelKeyword		Statement
-HiLink eiffelProperty		Statement
-HiLink eiffelInheritClause	Statement
-HiLink eiffelStatement	Statement
-HiLink eiffelDeclaration	Statement
-HiLink eiffelAssertion	Statement
-HiLink eiffelDebug		Statement
-HiLink eiffelException	Statement
-HiLink eiffelGenericCreate	Statement
+hi def link eiffelKeyword		Statement
+hi def link eiffelProperty		Statement
+hi def link eiffelInheritClause	Statement
+hi def link eiffelStatement	Statement
+hi def link eiffelDeclaration	Statement
+hi def link eiffelAssertion	Statement
+hi def link eiffelDebug		Statement
+hi def link eiffelException	Statement
+hi def link eiffelGenericCreate	Statement
 
-HiLink eiffelAgent		Statement
-HiLink eiffelConvert		Statement
+hi def link eiffelAgent		Statement
+hi def link eiffelConvert		Statement
 
-HiLink eiffelTopStruct	PreProc
+hi def link eiffelTopStruct	PreProc
 
-HiLink eiffelAll		Special
-HiLink eiffelAnchored		Special
-HiLink eiffelBitType		Special
+hi def link eiffelAll		Special
+hi def link eiffelAnchored		Special
+hi def link eiffelBitType		Special
 
 
-HiLink eiffelBool		Boolean
-HiLink eiffelString		String
-HiLink eiffelCharacter	Character
-HiLink eiffelClassName	Type
-HiLink eiffelNumber		Number
+hi def link eiffelBool		Boolean
+hi def link eiffelString		String
+hi def link eiffelCharacter	Character
+hi def link eiffelClassName	Type
+hi def link eiffelNumber		Number
 
-HiLink eiffelStringEscape	Special
+hi def link eiffelStringEscape	Special
 
-HiLink eiffelOperator		Special
-HiLink eiffelArray		Special
-HiLink eiffelExport		Special
-HiLink eiffelCreation		Special
-HiLink eiffelBrackets		Special
-HiLink eiffelGeneric		Special
-HiLink eiffelGenericDecl	Special
-HiLink eiffelConstraint	Special
-HiLink eiffelCreate		Special
-
-HiLink eiffelPredefined	Constant
+hi def link eiffelOperator		Special
+hi def link eiffelArray		Special
+hi def link eiffelExport		Special
+hi def link eiffelCreation		Special
+hi def link eiffelBrackets		Special
+hi def link eiffelGeneric		Special
+hi def link eiffelGenericDecl	Special
+hi def link eiffelConstraint	Special
+hi def link eiffelCreate		Special
 
-HiLink eiffelComment		Comment
+hi def link eiffelPredefined	Constant
+
+hi def link eiffelComment		Comment
 
-HiLink eiffelError		Error
-HiLink eiffelBadConstant	Error
-HiLink eiffelStringError	Error
-HiLink eiffelParenError	Error
-HiLink eiffelBracketError	Error
+hi def link eiffelError		Error
+hi def link eiffelBadConstant	Error
+hi def link eiffelStringError	Error
+hi def link eiffelParenError	Error
+hi def link eiffelBracketError	Error
 
-HiLink eiffelTodo		Todo
+hi def link eiffelTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "eiffel"
 
diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim
--- a/runtime/syntax/elf.vim
+++ b/runtime/syntax/elf.vim
@@ -61,23 +61,21 @@ syn match elfPunct "[,;]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink elfComment Comment
-HiLink elfPPCom Include
-HiLink elfKeyword Keyword
-HiLink elfSpecial Special
-HiLink elfEnvironment Special
-HiLink elfBraceError Error
-HiLink elfConditional Conditional
-HiLink elfMacro Function
-HiLink elfNumber Number
-HiLink elfString String
-HiLink elfParens Delimiter
-HiLink elfPunct Delimiter
+hi def link elfComment Comment
+hi def link elfPPCom Include
+hi def link elfKeyword Keyword
+hi def link elfSpecial Special
+hi def link elfEnvironment Special
+hi def link elfBraceError Error
+hi def link elfConditional Conditional
+hi def link elfMacro Function
+hi def link elfNumber Number
+hi def link elfString String
+hi def link elfParens Delimiter
+hi def link elfPunct Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "elf"
 
diff --git a/runtime/syntax/elmfilt.vim b/runtime/syntax/elmfilt.vim
--- a/runtime/syntax/elmfilt.vim
+++ b/runtime/syntax/elmfilt.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Elm Filter rules
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	6
+" Last Change:	Aug 31, 2016
+" Version:	8
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
 
 " quit when a syntax file was already loaded
@@ -35,25 +35,24 @@ syn region	elmfiltString	contained	start
 syn match	elmfiltSpaceError	contained	"\s.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_elmfilt_syntax_inits")
 
-HiLink elmfiltAction	Statement
-HiLink elmfiltArg	Special
-HiLink elmfiltComment	Comment
-HiLink elmfiltCond	Statement
-HiLink elmfiltIf	Statement
-HiLink elmfiltMatch	Special
-HiLink elmfiltMatchError	Error
-HiLink elmfiltNumber	Number
-HiLink elmfiltOper	Operator
-HiLink elmfiltOperKey	Type
-HiLink elmfiltParenError	Error
-HiLink elmfiltSpaceError	Error
-HiLink elmfiltString	String
-HiLink elmfiltThenError	Error
+  hi def link elmfiltAction	Statement
+  hi def link elmfiltArg	Special
+  hi def link elmfiltComment	Comment
+  hi def link elmfiltCond	Statement
+  hi def link elmfiltIf	Statement
+  hi def link elmfiltMatch	Special
+  hi def link elmfiltMatchError	Error
+  hi def link elmfiltNumber	Number
+  hi def link elmfiltOper	Operator
+  hi def link elmfiltOperKey	Type
+  hi def link elmfiltParenError	Error
+  hi def link elmfiltSpaceError	Error
+  hi def link elmfiltString	String
+  hi def link elmfiltThenError	Error
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "elmfilt"
 " vim: ts=9
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -143,106 +143,104 @@ let s:old_style = (exists("g:erlang_old_
                   \g:erlang_old_style_highlight == 1)
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Comments
-HiLink erlangComment Comment
-HiLink erlangCommentAnnotation Special
-HiLink erlangTodo Todo
-HiLink erlangShebang Comment
+hi def link erlangComment Comment
+hi def link erlangCommentAnnotation Special
+hi def link erlangTodo Todo
+hi def link erlangShebang Comment
 
 " Numbers
-HiLink erlangNumberInteger Number
-HiLink erlangNumberFloat Float
+hi def link erlangNumberInteger Number
+hi def link erlangNumberFloat Float
 
 " Strings, atoms, characters
-HiLink erlangString String
+hi def link erlangString String
 
 if s:old_style
-HiLink erlangQuotedAtom Type
+hi def link erlangQuotedAtom Type
 else
-HiLink erlangQuotedAtom String
+hi def link erlangQuotedAtom String
 endif
 
-HiLink erlangStringModifier Special
-HiLink erlangQuotedAtomModifier Special
-HiLink erlangModifier Special
+hi def link erlangStringModifier Special
+hi def link erlangQuotedAtomModifier Special
+hi def link erlangModifier Special
 
 " Operators, separators
-HiLink erlangOperator Operator
-HiLink erlangRightArrow Operator
+hi def link erlangOperator Operator
+hi def link erlangRightArrow Operator
 if s:old_style
-HiLink erlangBracket Normal
-HiLink erlangPipe Normal
+hi def link erlangBracket Normal
+hi def link erlangPipe Normal
 else
-HiLink erlangBracket Delimiter
-HiLink erlangPipe Delimiter
+hi def link erlangBracket Delimiter
+hi def link erlangPipe Delimiter
 endif
 
 " Atoms, functions, variables, macros
 if s:old_style
-HiLink erlangAtom Normal
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Function
-HiLink erlangGlobalFuncRef Function
-HiLink erlangVariable Normal
-HiLink erlangMacro Normal
-HiLink erlangRecord Normal
+hi def link erlangAtom Normal
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Function
+hi def link erlangGlobalFuncRef Function
+hi def link erlangVariable Normal
+hi def link erlangMacro Normal
+hi def link erlangRecord Normal
 else
-HiLink erlangAtom String
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Normal
-HiLink erlangGlobalFuncRef Normal
-HiLink erlangVariable Identifier
-HiLink erlangMacro Macro
-HiLink erlangRecord Structure
+hi def link erlangAtom String
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Normal
+hi def link erlangGlobalFuncRef Normal
+hi def link erlangVariable Identifier
+hi def link erlangMacro Macro
+hi def link erlangRecord Structure
 endif
 
 " Bitstrings
 if !s:old_style
-HiLink erlangBitType Type
+hi def link erlangBitType Type
 endif
 
 " Constants and Directives
 if s:old_style
-HiLink erlangAttribute Type
-HiLink erlangMacroDef Type
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Type
-HiLink erlangRecordDef Type
-HiLink erlangDefine Type
-HiLink erlangPreCondit Type
-HiLink erlangType Type
+hi def link erlangAttribute Type
+hi def link erlangMacroDef Type
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Type
+hi def link erlangRecordDef Type
+hi def link erlangDefine Type
+hi def link erlangPreCondit Type
+hi def link erlangType Type
 else
-HiLink erlangAttribute Keyword
-HiLink erlangMacroDef Macro
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Include
-HiLink erlangRecordDef Keyword
-HiLink erlangDefine Define
-HiLink erlangPreCondit PreCondit
-HiLink erlangType Type
+hi def link erlangAttribute Keyword
+hi def link erlangMacroDef Macro
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Include
+hi def link erlangRecordDef Keyword
+hi def link erlangDefine Define
+hi def link erlangPreCondit PreCondit
+hi def link erlangType Type
 endif
 
 " Keywords
-HiLink erlangKeyword Keyword
+hi def link erlangKeyword Keyword
 
 " Build-in-functions (BIFs)
-HiLink erlangBIF Function
+hi def link erlangBIF Function
 
 if s:old_style
-HiLink erlangBoolean Statement
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Statement
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 else
-HiLink erlangBoolean Boolean
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Boolean
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "erlang"
 
diff --git a/runtime/syntax/esqlc.vim b/runtime/syntax/esqlc.vim
--- a/runtime/syntax/esqlc.vim
+++ b/runtime/syntax/esqlc.vim
@@ -46,15 +46,13 @@ syntax keyword esqlcStatement	truncate u
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esqlcOperator	Operator
-HiLink esqlcStatement	Statement
-HiLink esqlcKeyword	esqlcSpecial
-HiLink esqlcSpecial	Special
-HiLink esqlcPreProc	PreProc
+hi def link esqlcOperator	Operator
+hi def link esqlcStatement	Statement
+hi def link esqlcKeyword	esqlcSpecial
+hi def link esqlcSpecial	Special
+hi def link esqlcPreProc	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "esqlc"
 
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -62,19 +62,17 @@ syn match esterelNone			"\<else\s\+if\>$
 syn match esterelNone			"\<else\s\+if\>\s"
 
 " Class Linking
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esterelStatement		Statement
-HiLink esterelType			Type
-HiLink esterelComment		Comment
-HiLink esterelBoolean		Number
-HiLink esterelExpressions	Number
-HiLink esterelIO			String
-HiLink esterelOperator		Type
-HiLink esterelSysCall		Type
-HiLink esterelFunctions		Type
-HiLink esterelSpecial		Special
+hi def link esterelStatement		Statement
+hi def link esterelType			Type
+hi def link esterelComment		Comment
+hi def link esterelBoolean		Number
+hi def link esterelExpressions	Number
+hi def link esterelIO			String
+hi def link esterelOperator		Type
+hi def link esterelSysCall		Type
+hi def link esterelFunctions		Type
+hi def link esterelSpecial		Special
 
-delcommand HiLink
 
 let b:current_syntax = "esterel"
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -63,26 +63,24 @@ syn match eParenError /[\]}]/ contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink eComment     Comment
-HiLink eConstant    Identifier
-HiLink eStringId    Identifier
-HiLink eCommand     Type
-HiLink eString      String
-HiLink eNumber      Number
-HiLink eBoolean     Boolean
-HiLink eFloat       Float
-HiLink eConditional Conditional
-HiLink eProgLang    Statement
-HiLink eOVP	      Statement
-HiLink eStdCmd      Statement
-HiLink eIdentifier  Normal
-HiLink eDelimiter   Delimiter
-HiLink eError       Error
-HiLink eBraceError  Error
-HiLink eCurlyError  Error
-HiLink eParenError  Error
-delcommand HiLink
+hi def link eComment     Comment
+hi def link eConstant    Identifier
+hi def link eStringId    Identifier
+hi def link eCommand     Type
+hi def link eString      String
+hi def link eNumber      Number
+hi def link eBoolean     Boolean
+hi def link eFloat       Float
+hi def link eConditional Conditional
+hi def link eProgLang    Statement
+hi def link eOVP	      Statement
+hi def link eStdCmd      Statement
+hi def link eIdentifier  Normal
+hi def link eDelimiter   Delimiter
+hi def link eError       Error
+hi def link eBraceError  Error
+hi def link eCurlyError  Error
+hi def link eParenError  Error
 
 let b:current_syntax="eviews"
 
diff --git a/runtime/syntax/exim.vim b/runtime/syntax/exim.vim
--- a/runtime/syntax/exim.vim
+++ b/runtime/syntax/exim.vim
@@ -88,20 +88,18 @@ syn keyword eximKeyword server_prompts s
 syn keyword eximKeyword server_secret client_name client_secret
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eximComment Comment
-HiLink eximFixme Todo
-HiLink eximEnd Keyword
-HiLink eximNumber Number
-HiLink eximDriverName Constant
-HiLink eximConstant Constant
-HiLink eximTime Constant
-HiLink eximKeyword Type
-HiLink eximSpecialChar Special
-HiLink eximMacroName Preproc
-HiLink eximTransport Identifier
+hi def link eximComment Comment
+hi def link eximFixme Todo
+hi def link eximEnd Keyword
+hi def link eximNumber Number
+hi def link eximDriverName Constant
+hi def link eximConstant Constant
+hi def link eximTime Constant
+hi def link eximKeyword Type
+hi def link eximSpecialChar Special
+hi def link eximMacroName Preproc
+hi def link eximTransport Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "exim"
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -79,26 +79,24 @@ syn match   expectSharpBang	"\%^#!.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink expectSharpBang	PreProc
-HiLink expectVariables	Special
-HiLink expectCommand		Function
-HiLink expectStatement	Statement
-HiLink expectConditional	Conditional
-HiLink expectRepeat		Repeat
-HiLink expectExpectOpts	Keyword
-HiLink expectOutVar		Special
-HiLink expectSpecial		Special
-HiLink expectNumber		Number
+hi def link expectSharpBang	PreProc
+hi def link expectVariables	Special
+hi def link expectCommand		Function
+hi def link expectStatement	Statement
+hi def link expectConditional	Conditional
+hi def link expectRepeat		Repeat
+hi def link expectExpectOpts	Keyword
+hi def link expectOutVar		Special
+hi def link expectSpecial		Special
+hi def link expectNumber		Number
 
-HiLink expectString		String
+hi def link expectString		String
 
-HiLink expectComment		Comment
-HiLink expectTodo		Todo
-"HiLink expectIdentifier	Identifier
+hi def link expectComment		Comment
+hi def link expectTodo		Todo
+"hi def link expectIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "expect"
 
diff --git a/runtime/syntax/exports.vim b/runtime/syntax/exports.vim
--- a/runtime/syntax/exports.vim
+++ b/runtime/syntax/exports.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	exports
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	5
+" Last Change:	Aug 31, 2016
+" Version:	7
 " Notes:		This file includes both SysV and BSD 'isms
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
 
@@ -36,24 +36,23 @@ syn match exportsSeparator	"[,:]"
 syn match exportsComment	"^\s*#.*$"	contains=@Spell
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_exports_syntax_inits")
 
-HiLink exportsKeyOptSet	exportsKeySettings
-HiLink exportsOptSet	exportsSettings
+  hi def link exportsKeyOptSet	exportsKeySettings
+  hi def link exportsOptSet	exportsSettings
 
-HiLink exportsComment	Comment
-HiLink exportsKeyOptions	Type
-HiLink exportsKeySettings	Keyword
-HiLink exportsOptions	Constant
-HiLink exportsSeparator	Constant
-HiLink exportsSettings	Constant
+  hi def link exportsComment	Comment
+  hi def link exportsKeyOptions	Type
+  hi def link exportsKeySettings	Keyword
+  hi def link exportsOptions	Constant
+  hi def link exportsSeparator	Constant
+  hi def link exportsSettings	Constant
 
-HiLink exportsOptError	Error
-HiLink exportsOptSetError	Error
-HiLink exportsSetError	Error
+  hi def link exportsOptError	Error
+  hi def link exportsOptSetError	Error
+  hi def link exportsSetError	Error
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "exports"
 " vim: ts=10
diff --git a/runtime/syntax/falcon.vim b/runtime/syntax/falcon.vim
--- a/runtime/syntax/falcon.vim
+++ b/runtime/syntax/falcon.vim
@@ -163,34 +163,32 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting
 if !exists("did_falcon_syn_inits")
-    command -nargs=+ HiLink hi def link <args>
 
-    HiLink falconKeyword          Keyword
-    HiLink falconCommentString    String
-    HiLink falconTodo             Todo
-    HiLink falconConditional      Keyword
-    HiLink falconRepeat           Repeat
-    HiLink falconcommentSkip      Comment
-    HiLink falconComment          Comment
-    HiLink falconCommentL         Comment
-    HiLink falconConst            Constant
-    HiLink falconConstants        Constant
-    HiLink falconOperator         Operator
-    HiLink falconSymbol           Normal
-    HiLink falconSpaceError       Error
-    HiLink falconHexadecimal      Number
-    HiLink falconOctal            Number
-    HiLink falconIntLiteral       Number
-    HiLink falconFloatLiteral     Float
-    HiLink falconStringEscape     Special
-    HiLink falconStringDelimiter  Delimiter
-    HiLink falconString           String
-    HiLink falconBool             Constant
-    HiLink falconSharpBang        PreProc
-    HiLink falconInclude          Include
-    HiLink falconSymbol           Constant
-    HiLink falconSymbolOther      Delimiter
-    delcommand HiLink
+    hi def link falconKeyword          Keyword
+    hi def link falconCommentString    String
+    hi def link falconTodo             Todo
+    hi def link falconConditional      Keyword
+    hi def link falconRepeat           Repeat
+    hi def link falconcommentSkip      Comment
+    hi def link falconComment          Comment
+    hi def link falconCommentL         Comment
+    hi def link falconConst            Constant
+    hi def link falconConstants        Constant
+    hi def link falconOperator         Operator
+    hi def link falconSymbol           Normal
+    hi def link falconSpaceError       Error
+    hi def link falconHexadecimal      Number
+    hi def link falconOctal            Number
+    hi def link falconIntLiteral       Number
+    hi def link falconFloatLiteral     Float
+    hi def link falconStringEscape     Special
+    hi def link falconStringDelimiter  Delimiter
+    hi def link falconString           String
+    hi def link falconBool             Constant
+    hi def link falconSharpBang        PreProc
+    hi def link falconInclude          Include
+    hi def link falconSymbol           Constant
+    hi def link falconSymbolOther      Delimiter
 endif
 
 let b:current_syntax = "falcon"
diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim
--- a/runtime/syntax/fdcc.vim
+++ b/runtime/syntax/fdcc.vim
@@ -56,47 +56,45 @@ syn region fdccBlank matchgroup=fdccLCAd
 
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink fdccBlank		 Blank
+hi def link fdccBlank		 Blank
 
-HiLink fdccTodo		 Todo
-HiLink fdccComment		 Comment
-HiLink fdccVariable		 Type
+hi def link fdccTodo		 Todo
+hi def link fdccComment		 Comment
+hi def link fdccVariable		 Type
 
-HiLink fdccLCIdentification	 Statement
-HiLink fdccLCCtype		 Statement
-HiLink fdccLCCollate		 Statement
-HiLink fdccLCMonetary		 Statement
-HiLink fdccLCNumeric		 Statement
-HiLink fdccLCTime		 Statement
-HiLink fdccLCMessages		 Statement
-HiLink fdccLCPaper		 Statement
-HiLink fdccLCTelephone	 Statement
-HiLink fdccLCMeasurement	 Statement
-HiLink fdccLCName		 Statement
-HiLink fdccLCAddress		 Statement
+hi def link fdccLCIdentification	 Statement
+hi def link fdccLCCtype		 Statement
+hi def link fdccLCCollate		 Statement
+hi def link fdccLCMonetary		 Statement
+hi def link fdccLCNumeric		 Statement
+hi def link fdccLCTime		 Statement
+hi def link fdccLCMessages		 Statement
+hi def link fdccLCPaper		 Statement
+hi def link fdccLCTelephone	 Statement
+hi def link fdccLCMeasurement	 Statement
+hi def link fdccLCName		 Statement
+hi def link fdccLCAddress		 Statement
 
-HiLink fdccUnicodeInValid	 Error
-HiLink fdccUnicodeValid	 String
-HiLink fdccString		 String
-HiLink fdccNumber		 Blank
+hi def link fdccUnicodeInValid	 Error
+hi def link fdccUnicodeValid	 String
+hi def link fdccString		 String
+hi def link fdccNumber		 Blank
 
-HiLink fdccKeywordIdentification fdccKeyword
-HiLink fdccKeywordCtype	   fdccKeyword
-HiLink fdccKeywordCollate	   fdccKeyword
-HiLink fdccKeywordMonetary	   fdccKeyword
-HiLink fdccKeywordNumeric	   fdccKeyword
-HiLink fdccKeywordTime	   fdccKeyword
-HiLink fdccKeywordMessages	   fdccKeyword
-HiLink fdccKeywordPaper	   fdccKeyword
-HiLink fdccKeywordTelephone	   fdccKeyword
-HiLink fdccKeywordMeasurement    fdccKeyword
-HiLink fdccKeywordName	   fdccKeyword
-HiLink fdccKeywordAddress	   fdccKeyword
-HiLink fdccKeyword		   Identifier
+hi def link fdccKeywordIdentification fdccKeyword
+hi def link fdccKeywordCtype	   fdccKeyword
+hi def link fdccKeywordCollate	   fdccKeyword
+hi def link fdccKeywordMonetary	   fdccKeyword
+hi def link fdccKeywordNumeric	   fdccKeyword
+hi def link fdccKeywordTime	   fdccKeyword
+hi def link fdccKeywordMessages	   fdccKeyword
+hi def link fdccKeywordPaper	   fdccKeyword
+hi def link fdccKeywordTelephone	   fdccKeyword
+hi def link fdccKeywordMeasurement    fdccKeyword
+hi def link fdccKeywordName	   fdccKeyword
+hi def link fdccKeywordAddress	   fdccKeyword
+hi def link fdccKeyword		   Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "fdcc"
 
diff --git a/runtime/syntax/fgl.vim b/runtime/syntax/fgl.vim
--- a/runtime/syntax/fgl.vim
+++ b/runtime/syntax/fgl.vim
@@ -117,19 +117,17 @@ syn sync ccomment fglComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink fglComment	Comment
-"HiLink fglKeyword	fglSpecial
-HiLink fglKeyword	fglStatement
-HiLink fglNumber	Number
-HiLink fglOperator	fglStatement
-HiLink fglSpecial	Special
-HiLink fglStatement	Statement
-HiLink fglString	String
-HiLink fglType	Type
+hi def link fglComment	Comment
+"hi def link fglKeyword	fglSpecial
+hi def link fglKeyword	fglStatement
+hi def link fglNumber	Number
+hi def link fglOperator	fglStatement
+hi def link fglSpecial	Special
+hi def link fglStatement	Statement
+hi def link fglString	String
+hi def link fglType	Type
 
-delcommand HiLink
 
 let b:current_syntax = "fgl"
 
diff --git a/runtime/syntax/focexec.vim b/runtime/syntax/focexec.vim
--- a/runtime/syntax/focexec.vim
+++ b/runtime/syntax/focexec.vim
@@ -67,23 +67,21 @@ syn match   focexecComment	"-\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink focexecString1		String
-HiLink focexecString2		String
-HiLink focexecNumber		Number
-HiLink focexecComment		Comment
-HiLink focexecTable		Keyword
-HiLink focexecModify		Keyword
-HiLink focexecNormal		Keyword
-HiLink focexecSet		Keyword
-HiLink focexecDash		Keyword
-HiLink focexecFileDef		Keyword
-HiLink focexecJoin		Keyword
-HiLink focexecAmperVar	Identifier
-HiLink focexecFuse		Function
+hi def link focexecString1		String
+hi def link focexecString2		String
+hi def link focexecNumber		Number
+hi def link focexecComment		Comment
+hi def link focexecTable		Keyword
+hi def link focexecModify		Keyword
+hi def link focexecNormal		Keyword
+hi def link focexecSet		Keyword
+hi def link focexecDash		Keyword
+hi def link focexecFileDef		Keyword
+hi def link focexecJoin		Keyword
+hi def link focexecAmperVar	Identifier
+hi def link focexecFuse		Function
 
-delcommand HiLink
 
 let b:current_syntax = "focexec"
 
diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim
--- a/runtime/syntax/form.vim
+++ b/runtime/syntax/form.vim
@@ -107,26 +107,25 @@ syn sync ccomment formComment minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink formConditional	Conditional
-HiLink formNumber		Number
-HiLink formStatement		Statement
-HiLink formComment		Comment
-HiLink formPreProc		PreProc
-HiLink formDirective		PreProc
-HiLink formType		Type
-HiLink formString		String
-HiLink formNestedString	String
-HiLink formReserved           Error
-HiLink formTodo               Todo
-HiLink formSpecial            SpecialChar
+hi def link formConditional	Conditional
+hi def link formNumber		Number
+hi def link formStatement		Statement
+hi def link formComment		Comment
+hi def link formPreProc		PreProc
+hi def link formDirective		PreProc
+hi def link formType		Type
+hi def link formString		String
+hi def link formNestedString	String
+hi def link formReserved           Error
+hi def link formTodo               Todo
+hi def link formSpecial            SpecialChar
 
 if !exists("form_enhanced_color")
-HiLink formHeaderStatement	Statement
+hi def link formHeaderStatement	Statement
 else
 " enhanced color mode
-HiLink formHeaderStatement	HeaderStatement
+hi def link formHeaderStatement	HeaderStatement
 " dark and a light background for local types
 if &background == "dark"
 hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
@@ -140,7 +139,6 @@ hi Statement guifg=LightYellow
 endif
 endif
 
-delcommand HiLink
 
   let b:current_syntax = "form"
 
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -283,47 +283,45 @@ syn region forthDeprecated start='locals
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink forthTodo Todo
-HiLink forthOperators Operator
-HiLink forthMath Number
-HiLink forthInteger Number
-HiLink forthFloat Float
-HiLink forthStack Special
-HiLink forthRstack Special
-HiLink forthFStack Special
-HiLink forthSP Special
-HiLink forthMemory Function
-HiLink forthAdrArith Function
-HiLink forthMemBlks Function
-HiLink forthCond Conditional
-HiLink forthLoop Repeat
-HiLink forthColonDef Define
-HiLink forthEndOfColonDef Define
-HiLink forthDefine Define
-HiLink forthDebug Debug
-HiLink forthAssembler Include
-HiLink forthCharOps Character
-HiLink forthConversion String
-HiLink forthForth Statement
-HiLink forthVocs Statement
-HiLink forthString String
-HiLink forthComment Comment
-HiLink forthClassDef Define
-HiLink forthEndOfClassDef Define
-HiLink forthObjectDef Define
-HiLink forthEndOfObjectDef Define
-HiLink forthInclude Include
-HiLink forthLocals Type " nothing else uses type and locals must stand out
-HiLink forthDeprecated Error " if you must, change to Type
-HiLink forthFileMode Function
-HiLink forthFileWords Statement
-HiLink forthBlocks Statement
-HiLink forthSpaceError Error
+hi def link forthTodo Todo
+hi def link forthOperators Operator
+hi def link forthMath Number
+hi def link forthInteger Number
+hi def link forthFloat Float
+hi def link forthStack Special
+hi def link forthRstack Special
+hi def link forthFStack Special
+hi def link forthSP Special
+hi def link forthMemory Function
+hi def link forthAdrArith Function
+hi def link forthMemBlks Function
+hi def link forthCond Conditional
+hi def link forthLoop Repeat
+hi def link forthColonDef Define
+hi def link forthEndOfColonDef Define
+hi def link forthDefine Define
+hi def link forthDebug Debug
+hi def link forthAssembler Include
+hi def link forthCharOps Character
+hi def link forthConversion String
+hi def link forthForth Statement
+hi def link forthVocs Statement
+hi def link forthString String
+hi def link forthComment Comment
+hi def link forthClassDef Define
+hi def link forthEndOfClassDef Define
+hi def link forthObjectDef Define
+hi def link forthEndOfObjectDef Define
+hi def link forthInclude Include
+hi def link forthLocals Type " nothing else uses type and locals must stand out
+hi def link forthDeprecated Error " if you must, change to Type
+hi def link forthFileMode Function
+hi def link forthFileWords Statement
+hi def link forthBlocks Statement
+hi def link forthSpaceError Error
 
-delcommand HiLink
 
 let b:current_syntax = "forth"
 
diff --git a/runtime/syntax/foxpro.vim b/runtime/syntax/foxpro.vim
--- a/runtime/syntax/foxpro.vim
+++ b/runtime/syntax/foxpro.vim
@@ -691,28 +691,26 @@ syn sync minlines=1 maxlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink foxproSpecial  Special
-HiLink foxproAtSymbol Special
-HiLink foxproAtCmd    Statement
-HiLink foxproPreProc  PreProc
-HiLink foxproFunc     Identifier
-HiLink foxproCmd      Statement
-HiLink foxproEnBlk    Type
-HiLink foxproSysVar   String
-HiLink foxproString   String
-HiLink foxproConst    Constant
-HiLink foxproNumber   Number
-HiLink foxproFloat    Float
-HiLink foxproComment  Comment
-HiLink foxproParenErr Error
-HiLink foxproCBConst  PreProc
-HiLink foxproCBField  Special
-HiLink foxproCBVar    Identifier
-HiLink foxproCBWin    Special
-HiLink foxproCBObject Identifier
+hi def link foxproSpecial  Special
+hi def link foxproAtSymbol Special
+hi def link foxproAtCmd    Statement
+hi def link foxproPreProc  PreProc
+hi def link foxproFunc     Identifier
+hi def link foxproCmd      Statement
+hi def link foxproEnBlk    Type
+hi def link foxproSysVar   String
+hi def link foxproString   String
+hi def link foxproConst    Constant
+hi def link foxproNumber   Number
+hi def link foxproFloat    Float
+hi def link foxproComment  Comment
+hi def link foxproParenErr Error
+hi def link foxproCBConst  PreProc
+hi def link foxproCBField  Special
+hi def link foxproCBVar    Identifier
+hi def link foxproCBWin    Special
+hi def link foxproCBObject Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "foxpro"
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -228,58 +228,56 @@ syn match fsFreqPass /\s\+.\{-}$/ contai
 " Whole line comments
 syn match fsCommentLine /^#.*$/ contains=@Spell
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink fsOperator Operator
-HiLink fsComment Comment
-HiLink fsCommentLine Comment
+hi def link fsOperator Operator
+hi def link fsComment Comment
+hi def link fsCommentLine Comment
 
-HiLink fsTypeKeyword Type
-HiLink fsDeviceKeyword Identifier
-HiLink fsDeviceLabel String
-HiLink fsDeviceUUID String
-HiLink fsDeviceSshfs String
-HiLink fsFreqPassNumber Number
+hi def link fsTypeKeyword Type
+hi def link fsDeviceKeyword Identifier
+hi def link fsDeviceLabel String
+hi def link fsDeviceUUID String
+hi def link fsDeviceSshfs String
+hi def link fsFreqPassNumber Number
 
 if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-HiLink fsTypeUnknown Error
+hi def link fsTypeUnknown Error
 endif
 
 if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
-HiLink fsDeviceError Error
+hi def link fsDeviceError Error
 endif
 
-HiLink fsMountPointError Error
-HiLink fsMountPointKeyword Keyword
-HiLink fsFreqPassError Error
+hi def link fsMountPointError Error
+hi def link fsMountPointKeyword Keyword
+hi def link fsFreqPassError Error
 
-HiLink fsOptionsGeneral Type
-HiLink fsOptionsKeywords Keyword
-HiLink fsOptionsNumber Number
-HiLink fsOptionsNumberOctal Number
-HiLink fsOptionsString String
-HiLink fsOptionsSize Number
-HiLink fsOptionsExt2Check String
-HiLink fsOptionsExt2Errors String
-HiLink fsOptionsExt3Journal String
-HiLink fsOptionsExt3Data String
-HiLink fsOptionsExt4Journal String
-HiLink fsOptionsExt4Data String
-HiLink fsOptionsExt4Barrier Number
-HiLink fsOptionsFatCheck String
-HiLink fsOptionsConv String
-HiLink fsOptionsFatType Number
-HiLink fsOptionsYesNo String
-HiLink fsOptionsHpfsCase String
-HiLink fsOptionsIsoMap String
-HiLink fsOptionsReiserHash String
-HiLink fsOptionsSshYesNoAsk String
-HiLink fsOptionsUfsType String
-HiLink fsOptionsUfsError String
+hi def link fsOptionsGeneral Type
+hi def link fsOptionsKeywords Keyword
+hi def link fsOptionsNumber Number
+hi def link fsOptionsNumberOctal Number
+hi def link fsOptionsString String
+hi def link fsOptionsSize Number
+hi def link fsOptionsExt2Check String
+hi def link fsOptionsExt2Errors String
+hi def link fsOptionsExt3Journal String
+hi def link fsOptionsExt3Data String
+hi def link fsOptionsExt4Journal String
+hi def link fsOptionsExt4Data String
+hi def link fsOptionsExt4Barrier Number
+hi def link fsOptionsFatCheck String
+hi def link fsOptionsConv String
+hi def link fsOptionsFatType Number
+hi def link fsOptionsYesNo String
+hi def link fsOptionsHpfsCase String
+hi def link fsOptionsIsoMap String
+hi def link fsOptionsReiserHash String
+hi def link fsOptionsSshYesNoAsk String
+hi def link fsOptionsUfsType String
+hi def link fsOptionsUfsError String
 
-HiLink fsOptionsVfatShortname String
+hi def link fsOptionsVfatShortname String
 
-delcommand HiLink
 
 let b:current_syntax = "fstab"
 
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -85,18 +85,16 @@ exec "syn sync ccomment gdbComment minli
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gdbFuncDef	Function
-HiLink gdbComment	Comment
-HiLink gdbStatement	Statement
-HiLink gdbString	String
-HiLink gdbCharacter	Character
-HiLink gdbVariable	Identifier
-HiLink gdbSet		Constant
-HiLink gdbInfo	Type
-HiLink gdbDocument	Special
-HiLink gdbNumber	Number
-delcommand HiLink
+hi def link gdbFuncDef	Function
+hi def link gdbComment	Comment
+hi def link gdbStatement	Statement
+hi def link gdbString	String
+hi def link gdbCharacter	Character
+hi def link gdbVariable	Identifier
+hi def link gdbSet		Constant
+hi def link gdbInfo	Type
+hi def link gdbDocument	Special
+hi def link gdbNumber	Number
 
 let b:current_syntax = "gdb"
 
diff --git a/runtime/syntax/gdmo.vim b/runtime/syntax/gdmo.vim
--- a/runtime/syntax/gdmo.vim
+++ b/runtime/syntax/gdmo.vim
@@ -62,23 +62,21 @@ syn sync ccomment gdmoComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gdmoCategory	      Structure
-HiLink gdmoRelationship     Macro
-HiLink gdmoDefinition       Statement
-HiLink gdmoReference	      Type
-HiLink gdmoExtension	      Operator
-HiLink gdmoBraces	      Function
-HiLink gdmoSpecial	      Special
-HiLink gdmoString	      String
-HiLink gdmoCharacter	      Character
-HiLink gdmoSpecialCharacter gdmoSpecial
-HiLink gdmoComment	      Comment
-HiLink gdmoLineComment      gdmoComment
-HiLink gdmoType	      Type
+hi def link gdmoCategory	      Structure
+hi def link gdmoRelationship     Macro
+hi def link gdmoDefinition       Statement
+hi def link gdmoReference	      Type
+hi def link gdmoExtension	      Operator
+hi def link gdmoBraces	      Function
+hi def link gdmoSpecial	      Special
+hi def link gdmoString	      String
+hi def link gdmoCharacter	      Character
+hi def link gdmoSpecialCharacter gdmoSpecial
+hi def link gdmoComment	      Comment
+hi def link gdmoLineComment      gdmoComment
+hi def link gdmoType	      Type
 
-delcommand HiLink
 
 let b:current_syntax = "gdmo"
 
diff --git a/runtime/syntax/gedcom.vim b/runtime/syntax/gedcom.vim
--- a/runtime/syntax/gedcom.vim
+++ b/runtime/syntax/gedcom.vim
@@ -39,17 +39,15 @@ syntax match gedcom_date ".*" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gedcom_record Statement
-HiLink gedcom_id Comment
-HiLink gedcom_ii PreProc
-HiLink gedcom_in Type
-HiLink gedcom_name PreProc
-HiLink gedcom_cname Type
-HiLink gedcom_surname Identifier
-HiLink gedcom_date Constant
+hi def link gedcom_record Statement
+hi def link gedcom_id Comment
+hi def link gedcom_ii PreProc
+hi def link gedcom_in Type
+hi def link gedcom_name PreProc
+hi def link gedcom_cname Type
+hi def link gedcom_surname Identifier
+hi def link gedcom_date Constant
 
-delcommand HiLink
 
 let b:current_syntax = "gedcom"
diff --git a/runtime/syntax/gkrellmrc.vim b/runtime/syntax/gkrellmrc.vim
--- a/runtime/syntax/gkrellmrc.vim
+++ b/runtime/syntax/gkrellmrc.vim
@@ -48,30 +48,28 @@ syn keyword gkrellmrcStyleCmd StyleMeter
 syn keyword gkrellmrcStyleItem textcolor alt_textcolor font alt_font transparency border label_position margin margins left_margin right_margin top_margin bottom_margin krell_depth krell_yoff krell_x_hot krell_expand krell_left_margin krell_right_margin
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gkrellmrcComment Comment
-HiLink gkrellmrcFixme Todo
+hi def link gkrellmrcComment Comment
+hi def link gkrellmrcFixme Todo
 
-HiLink gkrellmrcString gkrellmrcConstant
-HiLink gkrellmrcNumber gkrellmrcConstant
-HiLink gkrellmrcRGBColor gkrellmrcConstant
-HiLink gkrellmrcExpandMode gkrellmrcConstant
-HiLink gkrellmrcConstant Constant
+hi def link gkrellmrcString gkrellmrcConstant
+hi def link gkrellmrcNumber gkrellmrcConstant
+hi def link gkrellmrcRGBColor gkrellmrcConstant
+hi def link gkrellmrcExpandMode gkrellmrcConstant
+hi def link gkrellmrcConstant Constant
 
-HiLink gkrellmrcMeterName gkrellmrcClass
-HiLink gkrellmrcChartName gkrellmrcClass
-HiLink gkrellmrcSpecialClassName gkrellmrcClass
-HiLink gkrellmrcClass Type
+hi def link gkrellmrcMeterName gkrellmrcClass
+hi def link gkrellmrcChartName gkrellmrcClass
+hi def link gkrellmrcSpecialClassName gkrellmrcClass
+hi def link gkrellmrcClass Type
 
-HiLink gkrellmrcGlobal gkrellmrcItem
-HiLink gkrellmrcBuiltinExt gkrellmrcItem
-HiLink gkrellmrcStyleItem gkrellmrcItem
-HiLink gkrellmrcItem Function
+hi def link gkrellmrcGlobal gkrellmrcItem
+hi def link gkrellmrcBuiltinExt gkrellmrcItem
+hi def link gkrellmrcStyleItem gkrellmrcItem
+hi def link gkrellmrcItem Function
 
-HiLink gkrellmrcSetCmd Special
-HiLink gkrellmrcStyleCmd Statement
+hi def link gkrellmrcSetCmd Special
+hi def link gkrellmrcStyleCmd Statement
 
-delcommand HiLink
 
 let b:current_syntax = "gkrellmrc"
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -501,45 +501,43 @@ syn keyword gnuplotStatement	unset updat
 
 " ---- Define the default highlighting ---- "
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " ---- Comments ---- "
-HiLink gnuplotComment		Comment
+hi def link gnuplotComment		Comment
 
 " ---- Constants ---- "
-HiLink gnuplotString		String
-HiLink gnuplotNumber		Number
-HiLink gnuplotFloat		Float
+hi def link gnuplotString		String
+hi def link gnuplotNumber		Number
+hi def link gnuplotFloat		Float
 
 " ---- Identifiers ---- "
-HiLink gnuplotIdentifier	Identifier
+hi def link gnuplotIdentifier	Identifier
 
 " ---- Statements ---- "
-HiLink gnuplotConditional	Conditional
-HiLink gnuplotRepeat		Repeat
-HiLink gnuplotKeyword		Keyword
-HiLink gnuplotOperator	Operator
+hi def link gnuplotConditional	Conditional
+hi def link gnuplotRepeat		Repeat
+hi def link gnuplotKeyword		Keyword
+hi def link gnuplotOperator	Operator
 
 " ---- PreProcs ---- "
-HiLink gnuplotMacro		Macro
+hi def link gnuplotMacro		Macro
 
 " ---- Types ---- "
-HiLink gnuplotStatement	Type
-HiLink gnuplotFunc		Identifier
+hi def link gnuplotStatement	Type
+hi def link gnuplotFunc		Identifier
 
 " ---- Specials ---- "
-HiLink gnuplotSpecial		Special
-HiLink gnuplotUnit		Special
-HiLink gnuplotExternal	Special
+hi def link gnuplotSpecial		Special
+hi def link gnuplotUnit		Special
+hi def link gnuplotExternal	Special
 
 " ---- Errors ---- "
-HiLink gnuplotError		Error
-HiLink gnuplotOctalError	Error
+hi def link gnuplotError		Error
+hi def link gnuplotOctalError	Error
 
 " ---- Todos ---- "
-HiLink gnuplotTodo		Todo
+hi def link gnuplotTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "gnuplot"
 
diff --git a/runtime/syntax/godoc.vim b/runtime/syntax/godoc.vim
--- a/runtime/syntax/godoc.vim
+++ b/runtime/syntax/godoc.vim
@@ -10,11 +10,9 @@ endif
 syn case match
 syn match godocTitle "^\([A-Z][A-Z ]*\)$"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink godocTitle Title
+hi def link godocTitle Title
 
-delcommand HiLink
 
 let b:current_syntax = 'godoc'
 
diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim
--- a/runtime/syntax/gp.vim
+++ b/runtime/syntax/gp.vim
@@ -58,26 +58,24 @@ syntax region gpParen		transparent start
 syntax match gpParenError	")"
 syntax match gpInParen contained "[{}]"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gpConditional		Conditional
-HiLink gpRepeat		Repeat
-HiLink gpError		Error
-HiLink gpParenError		gpError
-HiLink gpInParen		gpError
-HiLink gpStatement		Statement
-HiLink gpString		String
-HiLink gpComment		Comment
-HiLink gpInterface		Type
-HiLink gpInput		Type
-HiLink gpInterfaceKey		Statement
-HiLink gpFunction		Function
-HiLink gpScope		Type
+hi def link gpConditional		Conditional
+hi def link gpRepeat		Repeat
+hi def link gpError		Error
+hi def link gpParenError		gpError
+hi def link gpInParen		gpError
+hi def link gpStatement		Statement
+hi def link gpString		String
+hi def link gpComment		Comment
+hi def link gpInterface		Type
+hi def link gpInput		Type
+hi def link gpInterfaceKey		Statement
+hi def link gpFunction		Function
+hi def link gpScope		Type
 " contained ones
-HiLink gpSpecial		Special
-HiLink gpTodo			Todo
-HiLink gpArgs			Type
-delcommand HiLink
+hi def link gpSpecial		Special
+hi def link gpTodo			Todo
+hi def link gpArgs			Type
 
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/grads.vim b/runtime/syntax/grads.vim
--- a/runtime/syntax/grads.vim
+++ b/runtime/syntax/grads.vim
@@ -51,25 +51,23 @@ syn match gradsComment	"\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't hgs highlighting+yet
-command -nargs=+ HiLink hi def link <args>
+
+hi def link gradsStatement		Statement
 
-HiLink gradsStatement		Statement
-
-HiLink gradsString		String
-HiLink gradsNumber		Number
+hi def link gradsString		String
+hi def link gradsNumber		Number
 
-HiLink gradsFixVariables	Special
-HiLink gradsVariables		Identifier
-HiLink gradsglobalVariables	Special
-HiLink gradsConst		Special
-
-HiLink gradsClassMethods	Function
+hi def link gradsFixVariables	Special
+hi def link gradsVariables		Identifier
+hi def link gradsglobalVariables	Special
+hi def link gradsConst		Special
 
-HiLink gradsOperator		Operator
-HiLink gradsComment		Comment
+hi def link gradsClassMethods	Function
 
-HiLink gradsTypos		Error
+hi def link gradsOperator		Operator
+hi def link gradsComment		Comment
 
-delcommand HiLink
+hi def link gradsTypos		Error
+
 
 let b:current_syntax = "grads"
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -62,25 +62,23 @@ syn region gBlockComment matchgroup=gCom
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gComment      Comment
-HiLink gCommentStart Comment
-HiLink gBlockComment Comment
-HiLink gString       String
-HiLink gNumber       Number
-HiLink gBoolean      Boolean
-HiLink gFloat        Float
-HiLink gCommands     Repeat	
-HiLink gGenrFunc     Type
-HiLink gDelimiter    Delimiter
-HiLink gError        Error
-HiLink gBraceError   Error
-HiLink gCurlyError   Error
-HiLink gParenError   Error
-HiLink gIdentifier   Normal
-HiLink gVariable     Identifier
-HiLink gArrow	       Repeat
-delcommand HiLink
+hi def link gComment      Comment
+hi def link gCommentStart Comment
+hi def link gBlockComment Comment
+hi def link gString       String
+hi def link gNumber       Number
+hi def link gBoolean      Boolean
+hi def link gFloat        Float
+hi def link gCommands     Repeat	
+hi def link gGenrFunc     Type
+hi def link gDelimiter    Delimiter
+hi def link gError        Error
+hi def link gBraceError   Error
+hi def link gCurlyError   Error
+hi def link gParenError   Error
+hi def link gIdentifier   Normal
+hi def link gVariable     Identifier
+hi def link gArrow	       Repeat
 
 let b:current_syntax="gretl"
 
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -56,9 +56,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ GroovyHiLink hi def link <args>
-
 " ##########################
 " Java stuff taken from java.vim
 " some characters that cannot be in a groovy program (outside a string)
@@ -138,9 +135,9 @@ if exists("groovy_highlight_groovy_lang_
   syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
   syn keyword groovyJavaLangObject notify notifyAll toString wait
 
-  GroovyHiLink groovyLangClass                   groovyConstant
-  GroovyHiLink groovyJavaLangClass               groovyExternal
-  GroovyHiLink groovyJavaLangObject              groovyConstant
+  hi def link groovyLangClass                   groovyConstant
+  hi def link groovyJavaLangClass               groovyExternal
+  hi def link groovyJavaLangObject              groovyConstant
   syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
   syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
 endif
@@ -214,9 +211,9 @@ syn region  groovyComment          start
 syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
 syn match   groovyCommentStar      contained "^\s*\*$"
 syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
-GroovyHiLink groovyCommentString groovyString
-GroovyHiLink groovyComment2String groovyString
-GroovyHiLink groovyCommentCharacter groovyCharacter
+hi def link groovyCommentString groovyString
+hi def link groovyComment2String groovyString
+hi def link groovyCommentCharacter groovyCharacter
 
 syn cluster groovyTop add=groovyComment,groovyLineComment
 
@@ -257,12 +254,12 @@ endif
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
 syn match groovyELExpr /\${.\{-}}/ contained
 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
-GroovyHiLink groovyELExpr Identifier
+hi def link groovyELExpr Identifier
 
 " TODO: better matching. I am waiting to understand how it really works in groovy
 " syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
 " syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
-" GroovyHiLink groovyClosureParams Identifier
+" hi def link groovyClosureParams Identifier
 
 " next line disabled, it can cause a crash for a long line
 "syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
@@ -323,21 +320,21 @@ if exists("groovy_highlight_debug")
 
   syn cluster groovyTop add=groovyDebug
 
-  GroovyHiLink groovyDebug                 Debug
-  GroovyHiLink groovyDebugString           DebugString
-  GroovyHiLink groovyDebugStringError      groovyError
-  GroovyHiLink groovyDebugType             DebugType
-  GroovyHiLink groovyDebugBoolean          DebugBoolean
-  GroovyHiLink groovyDebugNumber           Debug
-  GroovyHiLink groovyDebugSpecial          DebugSpecial
-  GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
-  GroovyHiLink groovyDebugCharacter        DebugString
-  GroovyHiLink groovyDebugParen            Debug
+  hi def link groovyDebug                 Debug
+  hi def link groovyDebugString           DebugString
+  hi def link groovyDebugStringError      groovyError
+  hi def link groovyDebugType             DebugType
+  hi def link groovyDebugBoolean          DebugBoolean
+  hi def link groovyDebugNumber           Debug
+  hi def link groovyDebugSpecial          DebugSpecial
+  hi def link groovyDebugSpecialCharacter DebugSpecial
+  hi def link groovyDebugCharacter        DebugString
+  hi def link groovyDebugParen            Debug
 
-  GroovyHiLink DebugString               String
-  GroovyHiLink DebugSpecial              Special
-  GroovyHiLink DebugBoolean              Boolean
-  GroovyHiLink DebugType                 Type
+  hi def link DebugString               String
+  hi def link DebugSpecial              Special
+  hi def link DebugBoolean              Boolean
+  hi def link DebugType                 Type
 endif
 
 " Match all Exception classes
@@ -371,7 +368,7 @@ exec "syn sync ccomment groovyComment mi
 
 if exists("groovy_mark_braces_in_parens_as_errors")
   syn match groovyInParen          contained "[{}]"
-  GroovyHiLink groovyInParen        groovyError
+  hi def link groovyInParen        groovyError
   syn cluster groovyTop add=groovyInParen
 endif
 
@@ -380,7 +377,7 @@ syn region  groovyParenT  transparent ma
 syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
 syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
 syn match   groovyParenError       ")"
-GroovyHiLink groovyParenError       groovyError
+hi def link groovyParenError       groovyError
 
 " catch errors caused by wrong square parenthesis
 syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
@@ -390,56 +387,54 @@ syn match   groovyParenError       "\]"
 
 " ###############################
 " java.vim default highlighting
-GroovyHiLink groovyFuncDef		Function
-GroovyHiLink groovyBraces		Function
-GroovyHiLink groovyBranch		Conditional
-GroovyHiLink groovyUserLabelRef	groovyUserLabel
-GroovyHiLink groovyLabel		Label
-GroovyHiLink groovyUserLabel		Label
-GroovyHiLink groovyConditional	Conditional
-GroovyHiLink groovyRepeat		Repeat
-GroovyHiLink groovyExceptions		Exception
-GroovyHiLink groovyAssert 		Statement
-GroovyHiLink groovyStorageClass	StorageClass
-GroovyHiLink groovyMethodDecl		groovyStorageClass
-GroovyHiLink groovyClassDecl		groovyStorageClass
-GroovyHiLink groovyScopeDecl		groovyStorageClass
-GroovyHiLink groovyBoolean		Boolean
-GroovyHiLink groovySpecial		Special
-GroovyHiLink groovySpecialError	Error
-GroovyHiLink groovySpecialCharError	Error
-GroovyHiLink groovyString		String
-GroovyHiLink groovyRegexChar		String
-GroovyHiLink groovyCharacter		Character
-GroovyHiLink groovySpecialChar	SpecialChar
-GroovyHiLink groovyNumber		Number
-GroovyHiLink groovyError		Error
-GroovyHiLink groovyStringError	Error
-GroovyHiLink groovyStatement		Statement
-GroovyHiLink groovyOperator		Operator
-GroovyHiLink groovyComment		Comment
-GroovyHiLink groovyDocComment		Comment
-GroovyHiLink groovyLineComment	Comment
-GroovyHiLink groovyConstant		Constant
-GroovyHiLink groovyTypedef		Typedef
-GroovyHiLink groovyTodo		Todo
+hi def link groovyFuncDef		Function
+hi def link groovyBraces		Function
+hi def link groovyBranch		Conditional
+hi def link groovyUserLabelRef	groovyUserLabel
+hi def link groovyLabel		Label
+hi def link groovyUserLabel		Label
+hi def link groovyConditional	Conditional
+hi def link groovyRepeat		Repeat
+hi def link groovyExceptions		Exception
+hi def link groovyAssert 		Statement
+hi def link groovyStorageClass	StorageClass
+hi def link groovyMethodDecl		groovyStorageClass
+hi def link groovyClassDecl		groovyStorageClass
+hi def link groovyScopeDecl		groovyStorageClass
+hi def link groovyBoolean		Boolean
+hi def link groovySpecial		Special
+hi def link groovySpecialError	Error
+hi def link groovySpecialCharError	Error
+hi def link groovyString		String
+hi def link groovyRegexChar		String
+hi def link groovyCharacter		Character
+hi def link groovySpecialChar	SpecialChar
+hi def link groovyNumber		Number
+hi def link groovyError		Error
+hi def link groovyStringError	Error
+hi def link groovyStatement		Statement
+hi def link groovyOperator		Operator
+hi def link groovyComment		Comment
+hi def link groovyDocComment		Comment
+hi def link groovyLineComment	Comment
+hi def link groovyConstant		Constant
+hi def link groovyTypedef		Typedef
+hi def link groovyTodo		Todo
 
-GroovyHiLink groovyCommentTitle	SpecialComment
-GroovyHiLink groovyDocTags		Special
-GroovyHiLink groovyDocParam		Function
-GroovyHiLink groovyCommentStar	groovyComment
-
-GroovyHiLink groovyType		Type
-GroovyHiLink groovyExternal		Include
+hi def link groovyCommentTitle	SpecialComment
+hi def link groovyDocTags		Special
+hi def link groovyDocParam		Function
+hi def link groovyCommentStar	groovyComment
 
-GroovyHiLink htmlComment		Special
-GroovyHiLink htmlCommentPart		Special
-GroovyHiLink groovySpaceError		Error
-GroovyHiLink groovyJDKBuiltin         Special
-GroovyHiLink groovyJDKOperOverl       Operator
-GroovyHiLink groovyJDKMethods         Function
+hi def link groovyType		Type
+hi def link groovyExternal		Include
 
-delcommand GroovyHiLink
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link groovySpaceError		Error
+hi def link groovyJDKBuiltin         Special
+hi def link groovyJDKOperOverl       Operator
+hi def link groovyJDKMethods         Function
 
 
 let b:current_syntax = "groovy"
diff --git a/runtime/syntax/gtkrc.vim b/runtime/syntax/gtkrc.vim
--- a/runtime/syntax/gtkrc.vim
+++ b/runtime/syntax/gtkrc.vim
@@ -79,50 +79,48 @@ syn sync minlines=50
 syn sync match gtkrcSyncClass groupthere NONE "^\s*class\>"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gtkrcComment Comment
-HiLink gtkrcFixme Todo
+hi def link gtkrcComment Comment
+hi def link gtkrcFixme Todo
 
-HiLink gtkrcInclude Preproc
+hi def link gtkrcInclude Preproc
 
-HiLink gtkrcACString gtkrcString
-HiLink gtkrcBString gtkrcString
-HiLink gtkrcString String
-HiLink gtkrcNumber Number
-HiLink gtkrcStateName gtkrcConstant
-HiLink gtkrcPriorityName gtkrcConstant
-HiLink gtkrcTextDirName gtkrcConstant
-HiLink gtkrcSettingsName Function
-HiLink gtkrcStockName Function
-HiLink gtkrcConstant Constant
+hi def link gtkrcACString gtkrcString
+hi def link gtkrcBString gtkrcString
+hi def link gtkrcString String
+hi def link gtkrcNumber Number
+hi def link gtkrcStateName gtkrcConstant
+hi def link gtkrcPriorityName gtkrcConstant
+hi def link gtkrcTextDirName gtkrcConstant
+hi def link gtkrcSettingsName Function
+hi def link gtkrcStockName Function
+hi def link gtkrcConstant Constant
 
-HiLink gtkrcPathSpecial gtkrcSpecial
-HiLink gtkrcWPathSpecial gtkrcSpecial
-HiLink gtkrcRGBColor gtkrcSpecial
-HiLink gtkrcKeyMod gtkrcSpecial
-HiLink gtkrcSpecial Special
+hi def link gtkrcPathSpecial gtkrcSpecial
+hi def link gtkrcWPathSpecial gtkrcSpecial
+hi def link gtkrcRGBColor gtkrcSpecial
+hi def link gtkrcKeyMod gtkrcSpecial
+hi def link gtkrcSpecial Special
 
-HiLink gtkrcTop gtkrcKeyword
-HiLink gtkrcPathSet gtkrcKeyword
-HiLink gtkrcStyleKeyword gtkrcKeyword
-HiLink gtkrcFunction gtkrcKeyword
-HiLink gtkrcBind gtkrcKeyword
-HiLink gtkrcKeyword Keyword
+hi def link gtkrcTop gtkrcKeyword
+hi def link gtkrcPathSet gtkrcKeyword
+hi def link gtkrcStyleKeyword gtkrcKeyword
+hi def link gtkrcFunction gtkrcKeyword
+hi def link gtkrcBind gtkrcKeyword
+hi def link gtkrcKeyword Keyword
 
-HiLink gtkrcClassNameGnome gtkrcGtkClass
-HiLink gtkrcClassName gtkrcGtkClass
-HiLink gtkrcFunctionName gtkrcGtkClass
-HiLink gtkrcGtkClass Type
+hi def link gtkrcClassNameGnome gtkrcGtkClass
+hi def link gtkrcClassName gtkrcGtkClass
+hi def link gtkrcFunctionName gtkrcGtkClass
+hi def link gtkrcGtkClass Type
 
-HiLink gtkrcImage gtkrcOtherword
-HiLink gtkrcOtherword Function
+hi def link gtkrcImage gtkrcOtherword
+hi def link gtkrcOtherword Function
 
-HiLink gtkrcParenError gtkrcError
-HiLink gtkrcBraceError gtkrcError
-HiLink gtkrcBracketError gtkrcError
-HiLink gtkrcError Error
+hi def link gtkrcParenError gtkrcError
+hi def link gtkrcBraceError gtkrcError
+hi def link gtkrcBracketError gtkrcError
+hi def link gtkrcError Error
 
-delcommand HiLink
 
 let b:current_syntax = "gtkrc"
diff --git a/runtime/syntax/hamster.vim b/runtime/syntax/hamster.vim
--- a/runtime/syntax/hamster.vim
+++ b/runtime/syntax/hamster.vim
@@ -357,15 +357,13 @@ syn sync ccomment hamsterHashComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink hamsterHashComment	Comment
-HiLink hamsterSpecial	Special
-HiLink hamsterStatement	Statement
-HiLink hamsterString	String
-HiLink hamsterFunction	Function
+hi def link hamsterHashComment	Comment
+hi def link hamsterSpecial	Special
+hi def link hamsterStatement	Statement
+hi def link hamsterString	String
+hi def link hamsterFunction	Function
 
-delcommand HiLink
 
 let b:current_syntax = "hamster"
 
diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim
--- a/runtime/syntax/haskell.vim
+++ b/runtime/syntax/haskell.vim
@@ -126,58 +126,56 @@ syn region	cCppString	start=+L\="+ skip=
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink hsModule			  hsStructure
-HiLink hsImport			  Include
-HiLink hsImportMod			  hsImport
-HiLink hsInfix			  PreProc
-HiLink hsStructure			  Structure
-HiLink hsStatement			  Statement
-HiLink hsConditional			  Conditional
-HiLink hsSpecialChar			  SpecialChar
-HiLink hsTypedef			  Typedef
-HiLink hsVarSym			  hsOperator
-HiLink hsConSym			  hsOperator
-HiLink hsOperator			  Operator
+hi def link hsModule			  hsStructure
+hi def link hsImport			  Include
+hi def link hsImportMod			  hsImport
+hi def link hsInfix			  PreProc
+hi def link hsStructure			  Structure
+hi def link hsStatement			  Statement
+hi def link hsConditional			  Conditional
+hi def link hsSpecialChar			  SpecialChar
+hi def link hsTypedef			  Typedef
+hi def link hsVarSym			  hsOperator
+hi def link hsConSym			  hsOperator
+hi def link hsOperator			  Operator
 if exists("hs_highlight_delimiters")
 " Some people find this highlighting distracting.
-HiLink hsDelimiter			  Delimiter
+hi def link hsDelimiter			  Delimiter
 endif
-HiLink hsSpecialCharError		  Error
-HiLink hsString			  String
-HiLink hsCharacter			  Character
-HiLink hsNumber			  Number
-HiLink hsFloat			  Float
-HiLink hsConditional			  Conditional
-HiLink hsLiterateComment		  hsComment
-HiLink hsBlockComment		  hsComment
-HiLink hsLineComment			  hsComment
-HiLink hsComment			  Comment
-HiLink hsPragma			  SpecialComment
-HiLink hsBoolean			  Boolean
-HiLink hsType			  Type
-HiLink hsMaybe			  hsEnumConst
-HiLink hsOrdering			  hsEnumConst
-HiLink hsEnumConst			  Constant
-HiLink hsDebug			  Debug
+hi def link hsSpecialCharError		  Error
+hi def link hsString			  String
+hi def link hsCharacter			  Character
+hi def link hsNumber			  Number
+hi def link hsFloat			  Float
+hi def link hsConditional			  Conditional
+hi def link hsLiterateComment		  hsComment
+hi def link hsBlockComment		  hsComment
+hi def link hsLineComment			  hsComment
+hi def link hsComment			  Comment
+hi def link hsPragma			  SpecialComment
+hi def link hsBoolean			  Boolean
+hi def link hsType			  Type
+hi def link hsMaybe			  hsEnumConst
+hi def link hsOrdering			  hsEnumConst
+hi def link hsEnumConst			  Constant
+hi def link hsDebug			  Debug
 
-HiLink cCppString		hsString
-HiLink cCommentStart		hsComment
-HiLink cCommentError		hsError
-HiLink cCommentStartError	hsError
-HiLink cInclude		Include
-HiLink cPreProc		PreProc
-HiLink cDefine		Macro
-HiLink cIncluded		hsString
-HiLink cError			Error
-HiLink cPreCondit		PreCondit
-HiLink cComment		Comment
-HiLink cCppSkip		cCppOut
-HiLink cCppOut2		cCppOut
-HiLink cCppOut		Comment
+hi def link cCppString		hsString
+hi def link cCommentStart		hsComment
+hi def link cCommentError		hsError
+hi def link cCommentStartError	hsError
+hi def link cInclude		Include
+hi def link cPreProc		PreProc
+hi def link cDefine		Macro
+hi def link cIncluded		hsString
+hi def link cError			Error
+hi def link cPreCondit		PreCondit
+hi def link cComment		Comment
+hi def link cCppSkip		cCppOut
+hi def link cCppOut2		cCppOut
+hi def link cCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "haskell"
 
diff --git a/runtime/syntax/hb.vim b/runtime/syntax/hb.vim
--- a/runtime/syntax/hb.vim
+++ b/runtime/syntax/hb.vim
@@ -61,22 +61,20 @@ syn match HBComment "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink HBhtmlString			 String
-HiLink HBhtmlTagN			 Function
-HiLink htmlSpecialChar		 String
+hi def link HBhtmlString			 String
+hi def link HBhtmlTagN			 Function
+hi def link htmlSpecialChar		 String
 
-HiLink HBInvalidLine Error
-HiLink HBFoobar Comment
+hi def link HBInvalidLine Error
+hi def link HBFoobar Comment
 hi HBFileName guibg=lightgray guifg=black
-HiLink HBDirectiveError Error
-HiLink HBDirectiveBlockEnd HBDirectiveKeyword
+hi def link HBDirectiveError Error
+hi def link HBDirectiveBlockEnd HBDirectiveKeyword
 hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
-HiLink HBComment Comment
-HiLink HBhtmlTagSk Statement
+hi def link HBComment Comment
+hi def link HBhtmlTagSk Statement
 
-delcommand HiLink
 
 syn sync match Normal grouphere NONE "^:\s*$"
 syn sync match Normal grouphere NONE "^:\s*lib\s\+[^ \t]\+$"
diff --git a/runtime/syntax/hercules.vim b/runtime/syntax/hercules.vim
--- a/runtime/syntax/hercules.vim
+++ b/runtime/syntax/hercules.vim
@@ -99,22 +99,20 @@ syn sync      lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink herculesStatement  Statement
-HiLink herculesType       Type
-HiLink herculesComment    Comment
-HiLink herculesPreProc    PreProc
-HiLink herculesTodo       Todo
-HiLink herculesOutput     Include
-HiLink herculesCmdCmnt    Identifier
-HiLink herculesNumber     Number
-HiLink herculesBraceError herculesError
-HiLink herculesCurlyError herculesError
-HiLink herculesParenError herculesError
-HiLink herculesError      Error
+hi def link herculesStatement  Statement
+hi def link herculesType       Type
+hi def link herculesComment    Comment
+hi def link herculesPreProc    PreProc
+hi def link herculesTodo       Todo
+hi def link herculesOutput     Include
+hi def link herculesCmdCmnt    Identifier
+hi def link herculesNumber     Number
+hi def link herculesBraceError herculesError
+hi def link herculesCurlyError herculesError
+hi def link herculesParenError herculesError
+hi def link herculesError      Error
 
-delcommand HiLink
 
 let b:current_syntax = "hercules"
 
diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -66,25 +66,23 @@ syn region hexExtAdrBlock start="^:[0-9a
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink hexRecStart            hexRecType
-HiLink hexDataByteCount       Constant
+hi def link hexRecStart            hexRecType
+hi def link hexDataByteCount       Constant
 hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink hexDataAddress         Comment
-HiLink hexNoAddress           DiffAdd
-HiLink hexRecTypeUnknown      hexRecType
-HiLink hexRecType             WarningMsg
+hi def link hexDataAddress         Comment
+hi def link hexNoAddress           DiffAdd
+hi def link hexRecTypeUnknown      hexRecType
+hi def link hexRecType             WarningMsg
 hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
 hi def hexDataOdd             term=bold cterm=bold gui=bold
 hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-HiLink hexDataUnexpected      Error
-HiLink hexExtendedAddress     hexDataAddress
-HiLink hexStartAddress        hexDataAddress
-HiLink hexChecksum            DiffChange
+hi def link hexDataUnexpected      Error
+hi def link hexExtendedAddress     hexDataAddress
+hi def link hexStartAddress        hexDataAddress
+hi def link hexChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "hex"
 
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -18,9 +18,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ HtmlHiLink hi def link <args>
-
 syntax spell toplevel
 
 syn case ignore
@@ -164,7 +161,7 @@ if main_syntax != 'java' || exists("java
   unlet b:current_syntax
   syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
   syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
-  HtmlHiLink htmlScriptTag htmlTag
+  hi def link htmlScriptTag htmlTag
 
   " html events (i.e. arguments that include javascript commands)
   if exists("html_extended_events")
@@ -176,8 +173,8 @@ if main_syntax != 'java' || exists("java
   endif
   syn region htmlEventSQ        contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
   syn region htmlEventDQ        contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
-  HtmlHiLink htmlEventSQ htmlEvent
-  HtmlHiLink htmlEventDQ htmlEvent
+  hi def link htmlEventSQ htmlEvent
+  hi def link htmlEventDQ htmlEvent
 
   " a javascript expression is used as an arg value
   syn region  javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
@@ -200,7 +197,7 @@ if main_syntax != 'java' || exists("java
   syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
   syn match htmlCssStyleComment contained "\(<!--\|-->\)"
   syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
-  HtmlHiLink htmlStyleArg htmlString
+  hi def link htmlStyleArg htmlString
 endif
 
 if main_syntax == "html"
@@ -214,33 +211,33 @@ if main_syntax == "html"
 endif
 
 " The default highlighting.
-HtmlHiLink htmlTag                     Function
-HtmlHiLink htmlEndTag                  Identifier
-HtmlHiLink htmlArg                     Type
-HtmlHiLink htmlTagName                 htmlStatement
-HtmlHiLink htmlSpecialTagName          Exception
-HtmlHiLink htmlValue                     String
-HtmlHiLink htmlSpecialChar             Special
+hi def link htmlTag                     Function
+hi def link htmlEndTag                  Identifier
+hi def link htmlArg                     Type
+hi def link htmlTagName                 htmlStatement
+hi def link htmlSpecialTagName          Exception
+hi def link htmlValue                     String
+hi def link htmlSpecialChar             Special
 
 if !exists("html_no_rendering")
-  HtmlHiLink htmlH1                      Title
-  HtmlHiLink htmlH2                      htmlH1
-  HtmlHiLink htmlH3                      htmlH2
-  HtmlHiLink htmlH4                      htmlH3
-  HtmlHiLink htmlH5                      htmlH4
-  HtmlHiLink htmlH6                      htmlH5
-  HtmlHiLink htmlHead                    PreProc
-  HtmlHiLink htmlTitle                   Title
-  HtmlHiLink htmlBoldItalicUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBold           htmlBoldUnderline
-  HtmlHiLink htmlUnderlineItalicBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderline         htmlUnderlineItalic
-  HtmlHiLink htmlItalicBold              htmlBoldItalic
-  HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlLink                    Underlined
-  HtmlHiLink htmlLeadingSpace            None
+  hi def link htmlH1                      Title
+  hi def link htmlH2                      htmlH1
+  hi def link htmlH3                      htmlH2
+  hi def link htmlH4                      htmlH3
+  hi def link htmlH5                      htmlH4
+  hi def link htmlH6                      htmlH5
+  hi def link htmlHead                    PreProc
+  hi def link htmlTitle                   Title
+  hi def link htmlBoldItalicUnderline     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBold           htmlBoldUnderline
+  hi def link htmlUnderlineItalicBold     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderline         htmlUnderlineItalic
+  hi def link htmlItalicBold              htmlBoldItalic
+  hi def link htmlItalicBoldUnderline     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderlineBold     htmlBoldUnderlineItalic
+  hi def link htmlLink                    Underlined
+  hi def link htmlLeadingSpace            None
   if !exists("html_my_rendering")
     hi def htmlBold                term=bold cterm=bold gui=bold
     hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
@@ -252,30 +249,28 @@ if !exists("html_no_rendering")
   endif
 endif
 
-HtmlHiLink htmlPreStmt            PreProc
-HtmlHiLink htmlPreError           Error
-HtmlHiLink htmlPreProc            PreProc
-HtmlHiLink htmlPreAttr            String
-HtmlHiLink htmlPreProcAttrName    PreProc
-HtmlHiLink htmlPreProcAttrError   Error
-HtmlHiLink htmlSpecial            Special
-HtmlHiLink htmlSpecialChar        Special
-HtmlHiLink htmlString             String
-HtmlHiLink htmlStatement          Statement
-HtmlHiLink htmlComment            Comment
-HtmlHiLink htmlCommentPart        Comment
-HtmlHiLink htmlValue              String
-HtmlHiLink htmlCommentError       htmlError
-HtmlHiLink htmlTagError           htmlError
-HtmlHiLink htmlEvent              javaScript
-HtmlHiLink htmlError              Error
+hi def link htmlPreStmt            PreProc
+hi def link htmlPreError           Error
+hi def link htmlPreProc            PreProc
+hi def link htmlPreAttr            String
+hi def link htmlPreProcAttrName    PreProc
+hi def link htmlPreProcAttrError   Error
+hi def link htmlSpecial            Special
+hi def link htmlSpecialChar        Special
+hi def link htmlString             String
+hi def link htmlStatement          Statement
+hi def link htmlComment            Comment
+hi def link htmlCommentPart        Comment
+hi def link htmlValue              String
+hi def link htmlCommentError       htmlError
+hi def link htmlTagError           htmlError
+hi def link htmlEvent              javaScript
+hi def link htmlError              Error
 
-HtmlHiLink javaScript             Special
-HtmlHiLink javaScriptExpression   javaScript
-HtmlHiLink htmlCssStyleComment    Comment
-HtmlHiLink htmlCssDefinition      Special
-
-delcommand HtmlHiLink
+hi def link javaScript             Special
+hi def link javaScriptExpression   javaScript
+hi def link htmlCssStyleComment    Comment
+hi def link htmlCssDefinition      Special
 
 let b:current_syntax = "html"
 
diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim
--- a/runtime/syntax/htmlos.vim
+++ b/runtime/syntax/htmlos.vim
@@ -115,33 +115,31 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink	 htmlosSpecialIdentifier	Operator
-HiLink	 htmlosIdentifier	Identifier
-HiLink	 htmlosStorageClass	StorageClass
-HiLink	 htmlosComment	Comment
-HiLink	 htmlosBoolean	Boolean
-HiLink	 htmlosStringSingle	String
-HiLink	 htmlosStringDouble	String
-HiLink	 htmlosNumber	Number
-HiLink	 htmlosFloat	Float
-HiLink	 htmlosFunctions	Function
-HiLink	 htmlosRepeat	Repeat
-HiLink	 htmlosConditional	Conditional
-HiLink	 htmlosLabel	Label
-HiLink	 htmlosStatement	Statement
-HiLink	 htmlosKeyword	Statement
-HiLink	 htmlosType	Type
-HiLink	 htmlosDefine	Define
-HiLink	 htmlosParent	Delimiter
-HiLink	 htmlosError	Error
-HiLink	 htmlosTodo	Todo
-HiLink	htmlosOperator	Operator
-HiLink	htmlosRelation	Operator
+hi def link htmlosSpecialIdentifier	Operator
+hi def link htmlosIdentifier	Identifier
+hi def link htmlosStorageClass	StorageClass
+hi def link htmlosComment	Comment
+hi def link htmlosBoolean	Boolean
+hi def link htmlosStringSingle	String
+hi def link htmlosStringDouble	String
+hi def link htmlosNumber	Number
+hi def link htmlosFloat	Float
+hi def link htmlosFunctions	Function
+hi def link htmlosRepeat	Repeat
+hi def link htmlosConditional	Conditional
+hi def link htmlosLabel	Label
+hi def link htmlosStatement	Statement
+hi def link htmlosKeyword	Statement
+hi def link htmlosType	Type
+hi def link htmlosDefine	Define
+hi def link htmlosParent	Delimiter
+hi def link htmlosError	Error
+hi def link htmlosTodo	Todo
+hi def link htmlosOperator	Operator
+hi def link htmlosRelation	Operator
 
-delcommand HiLink
 let b:current_syntax = "htmlos"
 
 if main_syntax == 'htmlos'
diff --git a/runtime/syntax/ia64.vim b/runtime/syntax/ia64.vim
--- a/runtime/syntax/ia64.vim
+++ b/runtime/syntax/ia64.vim
@@ -262,34 +262,32 @@ syn match ia64data "stringz\=\(\(\(\.ua\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "put masm groups with our groups
-HiLink masmOperator	ia64operator
-HiLink masmDirective	ia64Directive
-HiLink masmOpcode	ia64Opcode
-HiLink masmIdentifier	ia64Identifier
-HiLink masmFloat	ia64Float
+hi def link masmOperator	ia64operator
+hi def link masmDirective	ia64Directive
+hi def link masmOpcode	ia64Opcode
+hi def link masmIdentifier	ia64Identifier
+hi def link masmFloat	ia64Float
 
 "ia64 specific stuff
-HiLink ia64Label	Define
-HiLink ia64Comment	Comment
-HiLink ia64Directive	Type
-HiLink ia64opcode	Statement
-HiLink ia64registers	Operator
-HiLink ia64string	String
-HiLink ia64Hex		Number
-HiLink ia64Binary	Number
-HiLink ia64Octal	Number
-HiLink ia64Float	Float
-HiLink ia64Decimal	Number
-HiLink ia64Identifier	Identifier
-HiLink ia64data		Type
-HiLink ia64delimiter	Delimiter
-HiLink ia64operator	Operator
-HiLink ia64Todo		Todo
+hi def link ia64Label	Define
+hi def link ia64Comment	Comment
+hi def link ia64Directive	Type
+hi def link ia64opcode	Statement
+hi def link ia64registers	Operator
+hi def link ia64string	String
+hi def link ia64Hex		Number
+hi def link ia64Binary	Number
+hi def link ia64Octal	Number
+hi def link ia64Float	Float
+hi def link ia64Decimal	Number
+hi def link ia64Identifier	Identifier
+hi def link ia64data		Type
+hi def link ia64delimiter	Delimiter
+hi def link ia64operator	Operator
+hi def link ia64Todo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "ia64"
 
diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim
--- a/runtime/syntax/icon.vim
+++ b/runtime/syntax/icon.vim
@@ -155,47 +155,45 @@ exec "syn sync ccomment iconComment minl
 " Define the default highlighting.
 
 " Only when an item doesn't have highlighting
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 
-" HiLink iconSpecialCharacter	iconSpecial
+" hi def link iconSpecialCharacter	iconSpecial
 
-HiLink iconOctalError		iconError
-HiLink iconParenError		iconError
-HiLink iconInParen		iconError
-HiLink iconCommentError	iconError
-HiLink iconSpaceError		iconError
-HiLink iconCommentError	iconError
-HiLink iconIncluded		iconString
-HiLink iconCommentString	iconString
-HiLink iconComment2String	iconString
-HiLink iconCommentSkip	iconComment
+hi def link iconOctalError		iconError
+hi def link iconParenError		iconError
+hi def link iconInParen		iconError
+hi def link iconCommentError	iconError
+hi def link iconSpaceError		iconError
+hi def link iconCommentError	iconError
+hi def link iconIncluded		iconString
+hi def link iconCommentString	iconString
+hi def link iconComment2String	iconString
+hi def link iconCommentSkip	iconComment
 
-HiLink iconUserLabel		Label
-HiLink iconCharacter		Character
-HiLink iconNumber			Number
-HiLink iconRadix			Number
-HiLink iconFloat			Float
-HiLink iconInclude		Include
-HiLink iconPreProc		PreProc
-HiLink iconDefine			Macro
-HiLink iconError			Error
-HiLink iconStatement		Statement
-HiLink iconPreCondit		PreCondit
-HiLink iconString			String
-HiLink iconCset			String
-HiLink iconComment		Comment
-HiLink iconSpecial		SpecialChar
-HiLink iconTodo			Todo
-HiLink iconStorageClass	StorageClass
-HiLink iconFunction		Statement
-HiLink iconReserved		Label
-HiLink iconKeyword		Operator
+hi def link iconUserLabel		Label
+hi def link iconCharacter		Character
+hi def link iconNumber			Number
+hi def link iconRadix			Number
+hi def link iconFloat			Float
+hi def link iconInclude		Include
+hi def link iconPreProc		PreProc
+hi def link iconDefine			Macro
+hi def link iconError			Error
+hi def link iconStatement		Statement
+hi def link iconPreCondit		PreCondit
+hi def link iconString			String
+hi def link iconCset			String
+hi def link iconComment		Comment
+hi def link iconSpecial		SpecialChar
+hi def link iconTodo			Todo
+hi def link iconStorageClass	StorageClass
+hi def link iconFunction		Statement
+hi def link iconReserved		Label
+hi def link iconKeyword		Operator
 
-"HiLink iconIdentifier	Identifier
+"hi def link iconIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "icon"
 
diff --git a/runtime/syntax/idl.vim b/runtime/syntax/idl.vim
--- a/runtime/syntax/idl.vim
+++ b/runtime/syntax/idl.vim
@@ -222,100 +222,98 @@ try
   if !exists("did_idl_syntax_inits")
     let did_idl_syntax_inits = 1
     " The default methods for highlighting.  Can be overridden later
-    command -nargs=+ HiLink hi def link <args>
 
-    HiLink idlInclude             Include
-    HiLink idlPreProc             PreProc
-    HiLink idlPreCondit           PreCondit
-    HiLink idlDefine              Macro
-    HiLink idlIncluded            String
-    HiLink idlString              String
-    HiLink idlComment             Comment
-    HiLink idlTodo                Todo
-    HiLink idlLiteral             Number
-    HiLink idlUuid                Number
-    HiLink idlType                Type
-    HiLink idlVariantType         idlType
+    hi def link idlInclude             Include
+    hi def link idlPreProc             PreProc
+    hi def link idlPreCondit           PreCondit
+    hi def link idlDefine              Macro
+    hi def link idlIncluded            String
+    hi def link idlString              String
+    hi def link idlComment             Comment
+    hi def link idlTodo                Todo
+    hi def link idlLiteral             Number
+    hi def link idlUuid                Number
+    hi def link idlType                Type
+    hi def link idlVariantType         idlType
 
-    HiLink idlModule              Keyword
-    HiLink idlInterface           Keyword
-    HiLink idlEnum                Keyword
-    HiLink idlStruct              Keyword
-    HiLink idlUnion               Keyword
-    HiLink idlTypedef             Keyword
-    HiLink idlException           Keyword
-    HiLink idlTypedefOtherTypeQualifier keyword
+    hi def link idlModule              Keyword
+    hi def link idlInterface           Keyword
+    hi def link idlEnum                Keyword
+    hi def link idlStruct              Keyword
+    hi def link idlUnion               Keyword
+    hi def link idlTypedef             Keyword
+    hi def link idlException           Keyword
+    hi def link idlTypedefOtherTypeQualifier keyword
 
-    HiLink idlModuleName          Typedef
-    HiLink idlInterfaceName       Typedef
-    HiLink idlEnumName            Typedef
-    HiLink idlStructName          Typedef
-    HiLink idlUnionName           Typedef
+    hi def link idlModuleName          Typedef
+    hi def link idlInterfaceName       Typedef
+    hi def link idlEnumName            Typedef
+    hi def link idlStructName          Typedef
+    hi def link idlUnionName           Typedef
 
-    HiLink idlBaseTypeInt         idlType
-    HiLink idlBaseType            idlType
-    HiLink idlSeqType             idlType
-    HiLink idlD1                  Paren
-    HiLink idlD2                  Paren
-    HiLink idlD3                  Paren
-    HiLink idlD4                  Paren
-    "HiLink idlArraySize          Paren
-    "HiLink idlArraySize1         Paren
-    HiLink idlModuleContent       Paren
-    HiLink idlUnionContent        Paren
-    HiLink idlStructContent       Paren
-    HiLink idlEnumContents        Paren
-    HiLink idlInterfaceContent    Paren
+    hi def link idlBaseTypeInt         idlType
+    hi def link idlBaseType            idlType
+    hi def link idlSeqType             idlType
+    hi def link idlD1                  Paren
+    hi def link idlD2                  Paren
+    hi def link idlD3                  Paren
+    hi def link idlD4                  Paren
+    "hi def link idlArraySize          Paren
+    "hi def link idlArraySize1         Paren
+    hi def link idlModuleContent       Paren
+    hi def link idlUnionContent        Paren
+    hi def link idlStructContent       Paren
+    hi def link idlEnumContents        Paren
+    hi def link idlInterfaceContent    Paren
 
-    HiLink idlSimpDecl            Identifier
-    HiLink idlROAttr              StorageClass
-    HiLink idlAttr                Keyword
-    HiLink idlConst               StorageClass
+    hi def link idlSimpDecl            Identifier
+    hi def link idlROAttr              StorageClass
+    hi def link idlAttr                Keyword
+    hi def link idlConst               StorageClass
 
-    HiLink idlOneWayOp            StorageClass
-    HiLink idlOp                  idlType
-    HiLink idlParmType            idlType
-    HiLink idlOpName              Function
-    HiLink idlOpParms             SpecialComment
-    HiLink idlParmName            Identifier
-    HiLink idlInheritFrom         Identifier
-    HiLink idlAttribute           SpecialComment
+    hi def link idlOneWayOp            StorageClass
+    hi def link idlOp                  idlType
+    hi def link idlParmType            idlType
+    hi def link idlOpName              Function
+    hi def link idlOpParms             SpecialComment
+    hi def link idlParmName            Identifier
+    hi def link idlInheritFrom         Identifier
+    hi def link idlAttribute           SpecialComment
 
-    HiLink idlId                  Constant
-    "HiLink idlCase               Keyword
-    HiLink idlCaseLabel           Constant
+    hi def link idlId                  Constant
+    "hi def link idlCase               Keyword
+    hi def link idlCaseLabel           Constant
 
-    HiLink idlErrorBracket        Error
-    HiLink idlErrorBrace          Error
-    HiLink idlErrorSquareBracket  Error
+    hi def link idlErrorBracket        Error
+    hi def link idlErrorBrace          Error
+    hi def link idlErrorSquareBracket  Error
 
-    HiLink idlImport              Keyword
-    HiLink idlImportString        idlString
-    HiLink idlCoclassAttribute    StorageClass
-    HiLink idlLibrary             Keyword
-    HiLink idlImportlib           Keyword
-    HiLink idlCoclass             Keyword
-    HiLink idlLibraryName         Typedef
-    HiLink idlCoclassName         Typedef
-    " hi idlLibraryContent guifg=red
-    HiLink idlTypedefDecl         Typedef
-    HiLink idlDefEnum             Keyword
-    HiLink idlDefv1Enum           Keyword
-    HiLink idlDefEnumName         Typedef
-    HiLink idlDefEnumContents     Paren
-    HiLink idlDefBaseTypeInt      idlType
-    HiLink idlDefBaseType         idlType
-    HiLink idlDefSeqType          idlType
-    HiLink idlInterfaceSections   Label
+    hi def link idlImport              Keyword
+    hi def link idlImportString        idlString
+    hi def link idlCoclassAttribute    StorageClass
+    hi def link idlLibrary             Keyword
+    hi def link idlImportlib           Keyword
+    hi def link idlCoclass             Keyword
+    hi def link idlLibraryName         Typedef
+    hi def link idlCoclassName         Typedef
+    " hi def link idlLibraryContent guifg=red
+    hi def link idlTypedefDecl         Typedef
+    hi def link idlDefEnum             Keyword
+    hi def link idlDefv1Enum           Keyword
+    hi def link idlDefEnumName         Typedef
+    hi def link idlDefEnumContents     Paren
+    hi def link idlDefBaseTypeInt      idlType
+    hi def link idlDefBaseType         idlType
+    hi def link idlDefSeqType          idlType
+    hi def link idlInterfaceSections   Label
 
     if exists("idlsyntax_showerror")
       if exists("idlsyntax_showerror_soft")
         hi default idlError guibg=#d0ffd0
       else
-        HiLink idlError Error
+        hi def link idlError Error
       endif
     endif
-    delcommand HiLink
   endif
 
   let b:current_syntax = "idl"
diff --git a/runtime/syntax/idlang.vim b/runtime/syntax/idlang.vim
--- a/runtime/syntax/idlang.vim
+++ b/runtime/syntax/idlang.vim
@@ -217,26 +217,24 @@ syn keyword idlangRoutine XVOLUME_WRITE_
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink idlangConditional	Conditional
-HiLink idlangRoutine	Type
-HiLink idlangStatement	Statement
-HiLink idlangContinueLine	Todo
-HiLink idlangRealNumber	Float
-HiLink idlangNumber	Number
-HiLink idlangString	String
-HiLink idlangOperator	Operator
-HiLink idlangComment	Comment
-HiLink idlangTodo	Todo
-HiLink idlangPreCondit	Identifier
-HiLink idlangDblCommaError	Error
-HiLink idlangStop	Error
-HiLink idlangStrucvar	PreProc
-HiLink idlangSystem	Identifier
-HiLink idlangKeyword	Special
+hi def link idlangConditional	Conditional
+hi def link idlangRoutine	Type
+hi def link idlangStatement	Statement
+hi def link idlangContinueLine	Todo
+hi def link idlangRealNumber	Float
+hi def link idlangNumber	Number
+hi def link idlangString	String
+hi def link idlangOperator	Operator
+hi def link idlangComment	Comment
+hi def link idlangTodo	Todo
+hi def link idlangPreCondit	Identifier
+hi def link idlangDblCommaError	Error
+hi def link idlangStop	Error
+hi def link idlangStrucvar	PreProc
+hi def link idlangSystem	Identifier
+hi def link idlangKeyword	Special
 
-delcommand HiLink
 
 let b:current_syntax = "idlang"
 " vim: ts=18
diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim
--- a/runtime/syntax/inform.vim
+++ b/runtime/syntax/inform.vim
@@ -340,54 +340,52 @@ syn sync maxlines=500
 delcommand SynDisplay
 
 " The default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink informDefine		Define
-HiLink informType		Type
-HiLink informInclude		Include
-HiLink informPreCondit	PreCondit
-HiLink informPreProc		PreProc
-HiLink informGramPreProc	PreProc
-HiLink informAsm		Special
+hi def link informDefine		Define
+hi def link informType		Type
+hi def link informInclude		Include
+hi def link informPreCondit	PreCondit
+hi def link informPreProc		PreProc
+hi def link informGramPreProc	PreProc
+hi def link informAsm		Special
 if !exists("inform_suppress_obsolete")
-HiLink informAsmObsolete		informError
-HiLink informKeywordObsolete	informError
+hi def link informAsmObsolete		informError
+hi def link informKeywordObsolete	informError
 else
-HiLink informAsmObsolete		Special
-HiLink informKeywordObsolete	Keyword
+hi def link informAsmObsolete		Special
+hi def link informKeywordObsolete	Keyword
 endif
-HiLink informPredicate	Operator
-HiLink informSysFunc		Identifier
-HiLink informSysConst		Identifier
-HiLink informConditional	Conditional
-HiLink informRepeat		Repeat
-HiLink informStatement	Statement
-HiLink informOperator		Operator
-HiLink informKeyword		Keyword
-HiLink informGrammar		Keyword
-HiLink informDictString	String
-HiLink informNumber		Number
-HiLink informError		Error
-HiLink informString		String
-HiLink informComment		Comment
-HiLink informAccent		Special
-HiLink informStringUnicode	Special
-HiLink informStringCode	Special
-HiLink informTodo		Todo
+hi def link informPredicate	Operator
+hi def link informSysFunc		Identifier
+hi def link informSysConst		Identifier
+hi def link informConditional	Conditional
+hi def link informRepeat		Repeat
+hi def link informStatement	Statement
+hi def link informOperator		Operator
+hi def link informKeyword		Keyword
+hi def link informGrammar		Keyword
+hi def link informDictString	String
+hi def link informNumber		Number
+hi def link informError		Error
+hi def link informString		String
+hi def link informComment		Comment
+hi def link informAccent		Special
+hi def link informStringUnicode	Special
+hi def link informStringCode	Special
+hi def link informTodo		Todo
 if !exists("inform_highlight_simple")
-HiLink informLibAttrib	Identifier
-HiLink informLibProp	Identifier
-HiLink informLibObj		Identifier
-HiLink informLibRoutine	Identifier
-HiLink informLibVariable	Identifier
-HiLink informLibConst	Identifier
-HiLink informLibAction	Identifier
+hi def link informLibAttrib	Identifier
+hi def link informLibProp	Identifier
+hi def link informLibObj		Identifier
+hi def link informLibRoutine	Identifier
+hi def link informLibVariable	Identifier
+hi def link informLibConst	Identifier
+hi def link informLibAction	Identifier
 endif
-HiLink informBadDictString	informError
-HiLink informBadAccent	informError
-HiLink informBadStrUnicode	informError
+hi def link informBadDictString	informError
+hi def link informBadAccent	informError
+hi def link informBadStrUnicode	informError
 
-delcommand HiLink
 
 let b:current_syntax = "inform"
 
diff --git a/runtime/syntax/inittab.vim b/runtime/syntax/inittab.vim
--- a/runtime/syntax/inittab.vim
+++ b/runtime/syntax/inittab.vim
@@ -42,24 +42,22 @@ syn match inittabProcessPlus "+" contain
 syn region inittabProcess start="/" end="$" transparent oneline contained contains=@inittabSh,inittabComment
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink inittabComment Comment
-HiLink inittabFixme Todo
-HiLink inittabActionName Type
-HiLink inittabError Error
-HiLink inittabId Identifier
-HiLink inittabRunLevels Special
+hi def link inittabComment Comment
+hi def link inittabFixme Todo
+hi def link inittabActionName Type
+hi def link inittabError Error
+hi def link inittabId Identifier
+hi def link inittabRunLevels Special
 
-HiLink inittabColonProcess inittabColon
-HiLink inittabColonAction inittabColon
-HiLink inittabColonRunLevels inittabColon
-HiLink inittabColon PreProc
+hi def link inittabColonProcess inittabColon
+hi def link inittabColonAction inittabColon
+hi def link inittabColonRunLevels inittabColon
+hi def link inittabColon PreProc
 
-HiLink inittabShString String
-HiLink inittabShOption Special
-HiLink inittabShCommand Statement
+hi def link inittabShString String
+hi def link inittabShOption Special
+hi def link inittabShCommand Statement
 
-delcommand HiLink
 
 let b:current_syntax = "inittab"
diff --git a/runtime/syntax/ishd.vim b/runtime/syntax/ishd.vim
--- a/runtime/syntax/ishd.vim
+++ b/runtime/syntax/ishd.vim
@@ -385,26 +385,24 @@ syn region	ishdDefine		start="^\s*#\s*\(
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ishdNumber	    Number
-HiLink ishdError	    Error
-HiLink ishdStatement	    Statement
-HiLink ishdString	    String
-HiLink ishdComment	    Comment
-HiLink ishdTodo	    Todo
-HiLink ishdFunction	    Identifier
-HiLink ishdConstant	    PreProc
-HiLink ishdType	    Type
-HiLink ishdInclude	    Include
-HiLink ishdDefine	    Macro
-HiLink ishdIncluded	    String
-HiLink ishdPreCondit	    PreCondit
-HiLink ishdHashIf0Skip   ishdHashIf0
-HiLink ishdHashIf0End    ishdHashIf0
-HiLink ishdHashIf0	    Comment
+hi def link ishdNumber	    Number
+hi def link ishdError	    Error
+hi def link ishdStatement	    Statement
+hi def link ishdString	    String
+hi def link ishdComment	    Comment
+hi def link ishdTodo	    Todo
+hi def link ishdFunction	    Identifier
+hi def link ishdConstant	    PreProc
+hi def link ishdType	    Type
+hi def link ishdInclude	    Include
+hi def link ishdDefine	    Macro
+hi def link ishdIncluded	    String
+hi def link ishdPreCondit	    PreCondit
+hi def link ishdHashIf0Skip   ishdHashIf0
+hi def link ishdHashIf0End    ishdHashIf0
+hi def link ishdHashIf0	    Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ishd"
 
diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim
--- a/runtime/syntax/iss.vim
+++ b/runtime/syntax/iss.vim
@@ -103,35 +103,33 @@ syn keyword issTasksFlags checkedonce do
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink issSection	Special
-HiLink issComment	Comment
-HiLink issDirective	Type
-HiLink issParam	Type
-HiLink issFolder	Special
-HiLink issString	String
-HiLink issURL	Include
-HiLink issPreProc	PreProc 
+hi def link issSection	Special
+hi def link issComment	Comment
+hi def link issDirective	Type
+hi def link issParam	Type
+hi def link issFolder	Special
+hi def link issString	String
+hi def link issURL	Include
+hi def link issPreProc	PreProc 
 
-HiLink issDirsFlags		Keyword
-HiLink issFilesCopyMode	Keyword
-HiLink issFilesAttribs	Keyword
-HiLink issFilesPermissions	Keyword
-HiLink issFilesFlags		Keyword
-HiLink issIconsFlags		Keyword
-HiLink issINIFlags		Keyword
-HiLink issRegRootKey		Keyword
-HiLink issRegValueType	Keyword
-HiLink issRegFlags		Keyword
-HiLink issRunFlags		Keyword
-HiLink issTypesFlags		Keyword
-HiLink issComponentsFlags	Keyword
-HiLink issInstallDeleteType	Keyword
-HiLink issTasksFlags		Keyword
+hi def link issDirsFlags		Keyword
+hi def link issFilesCopyMode	Keyword
+hi def link issFilesAttribs	Keyword
+hi def link issFilesPermissions	Keyword
+hi def link issFilesFlags		Keyword
+hi def link issIconsFlags		Keyword
+hi def link issINIFlags		Keyword
+hi def link issRegRootKey		Keyword
+hi def link issRegValueType	Keyword
+hi def link issRegFlags		Keyword
+hi def link issRunFlags		Keyword
+hi def link issTypesFlags		Keyword
+hi def link issComponentsFlags	Keyword
+hi def link issInstallDeleteType	Keyword
+hi def link issTasksFlags		Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "iss"
 
diff --git a/runtime/syntax/ist.vim b/runtime/syntax/ist.vim
--- a/runtime/syntax/ist.vim
+++ b/runtime/syntax/ist.vim
@@ -39,19 +39,17 @@ syn match   IstTodo	   "DEBUG\|TODO"	 co
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink IstInpSpec	Type
-HiLink IstOutSpec	Identifier
-HiLink IstString	String
-HiLink IstNumber	Number
-HiLink IstComment	Comment
-HiLink IstTodo	Todo
-HiLink IstSpecial	Special
-HiLink IstDoubleQuote	Label
-HiLink IstCharacter	Label
+hi def link IstInpSpec	Type
+hi def link IstOutSpec	Identifier
+hi def link IstString	String
+hi def link IstNumber	Number
+hi def link IstComment	Comment
+hi def link IstTodo	Todo
+hi def link IstSpecial	Special
+hi def link IstDoubleQuote	Label
+hi def link IstCharacter	Label
 
-delcommand HiLink
 
 let b:current_syntax = "ist"
 
diff --git a/runtime/syntax/jal.vim b/runtime/syntax/jal.vim
--- a/runtime/syntax/jal.vim
+++ b/runtime/syntax/jal.vim
@@ -169,68 +169,66 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jalAcces		jalStatement
-HiLink jalBoolean		Boolean
-HiLink jalBit			Boolean
-HiLink jalComment		Comment
-HiLink jalConditional		Conditional
-HiLink jalConstant		Constant
-HiLink jalDelimiter		Identifier
-HiLink jalDirective		PreProc
-HiLink jalException		Exception
-HiLink jalFloat		Float
-HiLink jalFunction		Function
-HiLink jalPsudoVarsKey	Function
-HiLink jalLabel		Label
-HiLink jalMatrixDelimiter	Identifier
-HiLink jalModifier		Type
-HiLink jalNumber		Number
-HiLink jalBinNumber		Number
-HiLink jalHexNumber		Number
-HiLink jalOperator		Operator
-HiLink jalPredefined		Constant
-HiLink jalPreProc		PreProc
-HiLink jalRepeat		Repeat
-HiLink jalStatement		Statement
-HiLink jalString		String
-HiLink jalStringEscape	Special
-HiLink jalStringEscapeGPC	Special
-HiLink jalStringError		Error
-HiLink jalStruct		jalStatement
-HiLink jalSymbolOperator	jalOperator
-HiLink jalTodo		Todo
-HiLink jalType		Type
-HiLink jalUnclassified	Statement
-HiLink jalAsm			Assembler
-HiLink jalError		Error
-HiLink jalAsmKey		Statement
-HiLink jalPIC			Statement
+hi def link jalAcces		jalStatement
+hi def link jalBoolean		Boolean
+hi def link jalBit			Boolean
+hi def link jalComment		Comment
+hi def link jalConditional		Conditional
+hi def link jalConstant		Constant
+hi def link jalDelimiter		Identifier
+hi def link jalDirective		PreProc
+hi def link jalException		Exception
+hi def link jalFloat		Float
+hi def link jalFunction		Function
+hi def link jalPsudoVarsKey	Function
+hi def link jalLabel		Label
+hi def link jalMatrixDelimiter	Identifier
+hi def link jalModifier		Type
+hi def link jalNumber		Number
+hi def link jalBinNumber		Number
+hi def link jalHexNumber		Number
+hi def link jalOperator		Operator
+hi def link jalPredefined		Constant
+hi def link jalPreProc		PreProc
+hi def link jalRepeat		Repeat
+hi def link jalStatement		Statement
+hi def link jalString		String
+hi def link jalStringEscape	Special
+hi def link jalStringEscapeGPC	Special
+hi def link jalStringError		Error
+hi def link jalStruct		jalStatement
+hi def link jalSymbolOperator	jalOperator
+hi def link jalTodo		Todo
+hi def link jalType		Type
+hi def link jalUnclassified	Statement
+hi def link jalAsm			Assembler
+hi def link jalError		Error
+hi def link jalAsmKey		Statement
+hi def link jalPIC			Statement
 
-HiLink jalShowTab		Error
+hi def link jalShowTab		Error
 
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
 
-HiLink picOpcode		Keyword
-HiLink picRegister		Structure
-HiLink picRegisterPart	Special
-HiLink picPinDir		SPecial
-HiLink picPortDir		SPecial
+hi def link picOpcode		Keyword
+hi def link picRegister		Structure
+hi def link picRegisterPart	Special
+hi def link picPinDir		SPecial
+hi def link picPortDir		SPecial
 
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
 
-HiLink picIdentifier		Identifier
+hi def link picIdentifier		Identifier
 
-delcommand HiLink
 
 
 let b:current_syntax = "jal"
diff --git a/runtime/syntax/jam.vim b/runtime/syntax/jam.vim
--- a/runtime/syntax/jam.vim
+++ b/runtime/syntax/jam.vim
@@ -161,79 +161,77 @@ syntax match    jamOperator3Error   "*/"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jamCommentL		jamComment
-HiLink jamCommentL2		jamComment
-HiLink jamOperator3Error	jamError
-HiLink jamConditional	Conditional
-HiLink jamRepeat		Repeat
-HiLink jamCharacter		Character
-HiLink jamSpecialCharacter	jamSpecial
-HiLink jamNumber		Number
-HiLink jamParenError	jamError
-HiLink jamErrInParen	jamError
-HiLink jamErrInBracket	jamError
-HiLink jamCommentError	jamError
-HiLink jamSpaceError	jamError
-HiLink jamSpecialError	jamError
-HiLink jamOperator1		jamOperator
-HiLink jamOperator2		jamOperator
-HiLink jamOperator3		jamOperator
-HiLink jamOperator4		jamOperator
-HiLink jamOperator5		jamOperator
-HiLink jamOperator6		jamOperator
-HiLink jamOperator7		jamOperator
-HiLink jamOperator8		jamOperator
-HiLink jamOperator9		jamOperator
-HiLink jamOperator10	jamOperator
-HiLink jamOperator11	jamOperator
-HiLink jamOperator12	jamOperator
-HiLink jamOperator13	jamOperator
-HiLink jamOperator14	jamOperator
-HiLink jamError		Error
-HiLink jamStatement		Statement
-HiLink jamPreCondit		PreCondit
-HiLink jamCommentError	jamError
-HiLink jamCommentString	jamString
-HiLink jamComment2String	jamString
-HiLink jamCommentSkip	jamComment
-HiLink jamString		String
-HiLink jamComment		Comment
-HiLink jamSpecial		SpecialChar
-HiLink jamTodo		Todo
-HiLink jamCppSkip		jamCppOut
-HiLink jamCppOut2		jamCppOut
-HiLink jamCppOut		Comment
-HiLink jamDBState1		Identifier
-HiLink jamDBState2		Identifier
-HiLink jamSQLState1		jamSQL
-HiLink jamSQLState2		jamSQL
-HiLink jamLibFunc1		jamLibFunc
-HiLink jamLibFunc2		jamLibFunc
-HiLink jamLibFunc3		jamLibFunc
-HiLink jamLibFunc4		jamLibFunc
-HiLink jamLibFunc5		jamLibFunc
-HiLink jamLibFunc6		jamLibFunc
-HiLink jamLibFunc7		jamLibFunc
-HiLink jamLibFunc8		jamLibFunc
-HiLink jamLibFunc9		jamLibFunc
-HiLink jamVariable1		jamVariablen
-HiLink jamVariable2		jamVariablen
-HiLink jamVariable3		jamVariablen
-HiLink jamVariable4		jamVariablen
-HiLink jamVariable5		jamVariablen
-HiLink jamVariable6		jamVariablen
-HiLink jamVariable7		jamVariablen
-HiLink jamVariable8		jamVariablen
-HiLink jamVariable9		jamVariablen
-HiLink jamVariable10	jamVariablen
-HiLink jamVariablen		Constant
-HiLink jamSQL		Type
-HiLink jamLibFunc		PreProc
-HiLink jamOperator		Special
+hi def link jamCommentL		jamComment
+hi def link jamCommentL2		jamComment
+hi def link jamOperator3Error	jamError
+hi def link jamConditional	Conditional
+hi def link jamRepeat		Repeat
+hi def link jamCharacter		Character
+hi def link jamSpecialCharacter	jamSpecial
+hi def link jamNumber		Number
+hi def link jamParenError	jamError
+hi def link jamErrInParen	jamError
+hi def link jamErrInBracket	jamError
+hi def link jamCommentError	jamError
+hi def link jamSpaceError	jamError
+hi def link jamSpecialError	jamError
+hi def link jamOperator1		jamOperator
+hi def link jamOperator2		jamOperator
+hi def link jamOperator3		jamOperator
+hi def link jamOperator4		jamOperator
+hi def link jamOperator5		jamOperator
+hi def link jamOperator6		jamOperator
+hi def link jamOperator7		jamOperator
+hi def link jamOperator8		jamOperator
+hi def link jamOperator9		jamOperator
+hi def link jamOperator10	jamOperator
+hi def link jamOperator11	jamOperator
+hi def link jamOperator12	jamOperator
+hi def link jamOperator13	jamOperator
+hi def link jamOperator14	jamOperator
+hi def link jamError		Error
+hi def link jamStatement		Statement
+hi def link jamPreCondit		PreCondit
+hi def link jamCommentError	jamError
+hi def link jamCommentString	jamString
+hi def link jamComment2String	jamString
+hi def link jamCommentSkip	jamComment
+hi def link jamString		String
+hi def link jamComment		Comment
+hi def link jamSpecial		SpecialChar
+hi def link jamTodo		Todo
+hi def link jamCppSkip		jamCppOut
+hi def link jamCppOut2		jamCppOut
+hi def link jamCppOut		Comment
+hi def link jamDBState1		Identifier
+hi def link jamDBState2		Identifier
+hi def link jamSQLState1		jamSQL
+hi def link jamSQLState2		jamSQL
+hi def link jamLibFunc1		jamLibFunc
+hi def link jamLibFunc2		jamLibFunc
+hi def link jamLibFunc3		jamLibFunc
+hi def link jamLibFunc4		jamLibFunc
+hi def link jamLibFunc5		jamLibFunc
+hi def link jamLibFunc6		jamLibFunc
+hi def link jamLibFunc7		jamLibFunc
+hi def link jamLibFunc8		jamLibFunc
+hi def link jamLibFunc9		jamLibFunc
+hi def link jamVariable1		jamVariablen
+hi def link jamVariable2		jamVariablen
+hi def link jamVariable3		jamVariablen
+hi def link jamVariable4		jamVariablen
+hi def link jamVariable5		jamVariablen
+hi def link jamVariable6		jamVariablen
+hi def link jamVariable7		jamVariablen
+hi def link jamVariable8		jamVariablen
+hi def link jamVariable9		jamVariablen
+hi def link jamVariable10	jamVariablen
+hi def link jamVariablen		Constant
+hi def link jamSQL		Type
+hi def link jamLibFunc		PreProc
+hi def link jamOperator		Special
 
-delcommand HiLink
 
 let b:current_syntax = "jam"
 
diff --git a/runtime/syntax/jargon.vim b/runtime/syntax/jargon.vim
--- a/runtime/syntax/jargon.vim
+++ b/runtime/syntax/jargon.vim
@@ -15,11 +15,9 @@ syn match jargonMark	/{[^}]*}/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jargonChaptTitle	Title
-HiLink jargonEmailAddr	 Comment
-HiLink jargonUrl	 Comment
-HiLink jargonMark	Label
-delcommand HiLink
+hi def link jargonChaptTitle	Title
+hi def link jargonEmailAddr	 Comment
+hi def link jargonUrl	 Comment
+hi def link jargonMark	Label
 
 let b:current_syntax = "jargon"
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -19,9 +19,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ JavaHiLink hi def link <args>
-
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
@@ -30,7 +27,7 @@ syn match javaOK "\.\.\."
 
 " use separate name so that it can be deleted in javacc.vim
 syn match   javaError2 "#\|=<"
-JavaHiLink javaError2 javaError
+hi def link javaError2 javaError
 
 
 
@@ -73,32 +70,32 @@ if exists("java_highlight_all")  || exis
   syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
   syn cluster javaTop add=javaR_JavaLang
   syn cluster javaClasses add=javaR_JavaLang
-  JavaHiLink javaR_JavaLang javaR_Java
+  hi def link javaR_JavaLang javaR_Java
   syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
   syn cluster javaTop add=javaC_JavaLang
   syn cluster javaClasses add=javaC_JavaLang
-  JavaHiLink javaC_JavaLang javaC_Java
+  hi def link javaC_JavaLang javaC_Java
   syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
   syn cluster javaTop add=javaE_JavaLang
   syn cluster javaClasses add=javaE_JavaLang
-  JavaHiLink javaE_JavaLang javaE_Java
+  hi def link javaE_JavaLang javaE_Java
   syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
   syn cluster javaTop add=javaX_JavaLang
   syn cluster javaClasses add=javaX_JavaLang
-  JavaHiLink javaX_JavaLang javaX_Java
+  hi def link javaX_JavaLang javaX_Java
 
-  JavaHiLink javaR_Java javaR_
-  JavaHiLink javaC_Java javaC_
-  JavaHiLink javaE_Java javaE_
-  JavaHiLink javaX_Java javaX_
-  JavaHiLink javaX_		     javaExceptions
-  JavaHiLink javaR_		     javaExceptions
-  JavaHiLink javaE_		     javaExceptions
-  JavaHiLink javaC_		     javaConstant
+  hi def link javaR_Java javaR_
+  hi def link javaC_Java javaC_
+  hi def link javaE_Java javaE_
+  hi def link javaX_Java javaX_
+  hi def link javaX_		     javaExceptions
+  hi def link javaR_		     javaExceptions
+  hi def link javaE_		     javaExceptions
+  hi def link javaC_		     javaConstant
 
   syn keyword javaLangObject clone equals finalize getClass hashCode
   syn keyword javaLangObject notify notifyAll toString wait
-  JavaHiLink javaLangObject		     javaConstant
+  hi def link javaLangObject		     javaConstant
   syn cluster javaTop add=javaLangObject
 endif
 
@@ -141,9 +138,9 @@ syn region  javaComment		 start="/\*"  e
 syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
 syn match   javaCommentStar	 contained "^\s*\*$"
 syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
-JavaHiLink javaCommentString javaString
-JavaHiLink javaComment2String javaString
-JavaHiLink javaCommentCharacter javaCharacter
+hi def link javaCommentString javaString
+hi def link javaComment2String javaString
+hi def link javaCommentCharacter javaCharacter
 
 syn cluster javaTop add=javaComment,javaLineComment
 
@@ -236,26 +233,26 @@ if exists("java_highlight_debug")
 
   syn cluster javaTop add=javaDebug
 
-  JavaHiLink javaDebug		 Debug
-  JavaHiLink javaDebugString		 DebugString
-  JavaHiLink javaDebugStringError	 javaError
-  JavaHiLink javaDebugType		 DebugType
-  JavaHiLink javaDebugBoolean		 DebugBoolean
-  JavaHiLink javaDebugNumber		 Debug
-  JavaHiLink javaDebugSpecial		 DebugSpecial
-  JavaHiLink javaDebugSpecialCharacter DebugSpecial
-  JavaHiLink javaDebugCharacter	 DebugString
-  JavaHiLink javaDebugParen		 Debug
+  hi def link javaDebug		 Debug
+  hi def link javaDebugString		 DebugString
+  hi def link javaDebugStringError	 javaError
+  hi def link javaDebugType		 DebugType
+  hi def link javaDebugBoolean		 DebugBoolean
+  hi def link javaDebugNumber		 Debug
+  hi def link javaDebugSpecial		 DebugSpecial
+  hi def link javaDebugSpecialCharacter DebugSpecial
+  hi def link javaDebugCharacter	 DebugString
+  hi def link javaDebugParen		 Debug
 
-  JavaHiLink DebugString		 String
-  JavaHiLink DebugSpecial		 Special
-  JavaHiLink DebugBoolean		 Boolean
-  JavaHiLink DebugType		 Type
+  hi def link DebugString		 String
+  hi def link DebugSpecial		 Special
+  hi def link DebugBoolean		 Boolean
+  hi def link DebugType		 Type
 endif
 
 if exists("java_mark_braces_in_parens_as_errors")
   syn match javaInParen		 contained "[{}]"
-  JavaHiLink javaInParen	javaError
+  hi def link javaInParen	javaError
   syn cluster javaTop add=javaInParen
 endif
 
@@ -270,7 +267,7 @@ syn region  javaParenT1 transparent matc
 syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
 syn match   javaParenError	 "\]"
 
-JavaHiLink javaParenError	javaError
+hi def link javaParenError	javaError
 
 if exists("java_highlight_functions")
    syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
@@ -283,56 +280,54 @@ endif
 exec "syn sync ccomment javaComment minlines=" . java_minlines
 
 " The default highlighting.
-JavaHiLink javaLambdaDef		Function
-JavaHiLink javaFuncDef		Function
-JavaHiLink javaVarArg			Function
-JavaHiLink javaBraces			Function
-JavaHiLink javaBranch			Conditional
-JavaHiLink javaUserLabelRef		javaUserLabel
-JavaHiLink javaLabel			Label
-JavaHiLink javaUserLabel		Label
-JavaHiLink javaConditional		Conditional
-JavaHiLink javaRepeat			Repeat
-JavaHiLink javaExceptions		Exception
-JavaHiLink javaAssert			Statement
-JavaHiLink javaStorageClass		StorageClass
-JavaHiLink javaMethodDecl		javaStorageClass
-JavaHiLink javaClassDecl		javaStorageClass
-JavaHiLink javaScopeDecl		javaStorageClass
-JavaHiLink javaBoolean		Boolean
-JavaHiLink javaSpecial		Special
-JavaHiLink javaSpecialError		Error
-JavaHiLink javaSpecialCharError	Error
-JavaHiLink javaString			String
-JavaHiLink javaCharacter		Character
-JavaHiLink javaSpecialChar		SpecialChar
-JavaHiLink javaNumber			Number
-JavaHiLink javaError			Error
-JavaHiLink javaStringError		Error
-JavaHiLink javaStatement		Statement
-JavaHiLink javaOperator		Operator
-JavaHiLink javaComment		Comment
-JavaHiLink javaDocComment		Comment
-JavaHiLink javaLineComment		Comment
-JavaHiLink javaConstant		Constant
-JavaHiLink javaTypedef		Typedef
-JavaHiLink javaTodo			Todo
-JavaHiLink javaAnnotation		PreProc
+hi def link javaLambdaDef		Function
+hi def link javaFuncDef		Function
+hi def link javaVarArg			Function
+hi def link javaBraces			Function
+hi def link javaBranch			Conditional
+hi def link javaUserLabelRef		javaUserLabel
+hi def link javaLabel			Label
+hi def link javaUserLabel		Label
+hi def link javaConditional		Conditional
+hi def link javaRepeat			Repeat
+hi def link javaExceptions		Exception
+hi def link javaAssert			Statement
+hi def link javaStorageClass		StorageClass
+hi def link javaMethodDecl		javaStorageClass
+hi def link javaClassDecl		javaStorageClass
+hi def link javaScopeDecl		javaStorageClass
+hi def link javaBoolean		Boolean
+hi def link javaSpecial		Special
+hi def link javaSpecialError		Error
+hi def link javaSpecialCharError	Error
+hi def link javaString			String
+hi def link javaCharacter		Character
+hi def link javaSpecialChar		SpecialChar
+hi def link javaNumber			Number
+hi def link javaError			Error
+hi def link javaStringError		Error
+hi def link javaStatement		Statement
+hi def link javaOperator		Operator
+hi def link javaComment		Comment
+hi def link javaDocComment		Comment
+hi def link javaLineComment		Comment
+hi def link javaConstant		Constant
+hi def link javaTypedef		Typedef
+hi def link javaTodo			Todo
+hi def link javaAnnotation		PreProc
 
-JavaHiLink javaCommentTitle		SpecialComment
-JavaHiLink javaDocTags		Special
-JavaHiLink javaDocParam		Function
-JavaHiLink javaDocSeeTagParam		Function
-JavaHiLink javaCommentStar		javaComment
+hi def link javaCommentTitle		SpecialComment
+hi def link javaDocTags		Special
+hi def link javaDocParam		Function
+hi def link javaDocSeeTagParam		Function
+hi def link javaCommentStar		javaComment
 
-JavaHiLink javaType			Type
-JavaHiLink javaExternal		Include
+hi def link javaType			Type
+hi def link javaExternal		Include
 
-JavaHiLink htmlComment		Special
-JavaHiLink htmlCommentPart		Special
-JavaHiLink javaSpaceError		Error
-
-delcommand JavaHiLink
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link javaSpaceError		Error
 
 let b:current_syntax = "java"
 
diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -52,13 +52,11 @@ syn keyword javaccError DEBUG IGNORE_IN_
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaccSpecToken Statement
-HiLink javaccActionToken Type
-HiLink javaccPackages javaScopeDecl
-HiLink javaccToken String
-HiLink javaccError Error
-delcommand HiLink
+hi def link javaccSpecToken Statement
+hi def link javaccActionToken Type
+hi def link javaccPackages javaScopeDecl
+hi def link javaccToken String
+hi def link javaccError Error
 
 let b:current_syntax = "javacc"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -80,42 +80,40 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaScriptComment		Comment
-HiLink javaScriptLineComment		Comment
-HiLink javaScriptCommentTodo		Todo
-HiLink javaScriptSpecial		Special
-HiLink javaScriptStringS		String
-HiLink javaScriptStringD		String
-HiLink javaScriptCharacter		Character
-HiLink javaScriptSpecialCharacter	javaScriptSpecial
-HiLink javaScriptNumber		javaScriptValue
-HiLink javaScriptConditional		Conditional
-HiLink javaScriptRepeat		Repeat
-HiLink javaScriptBranch		Conditional
-HiLink javaScriptOperator		Operator
-HiLink javaScriptType			Type
-HiLink javaScriptStatement		Statement
-HiLink javaScriptFunction		Function
-HiLink javaScriptBraces		Function
-HiLink javaScriptError		Error
-HiLink javaScrParenError		javaScriptError
-HiLink javaScriptNull			Keyword
-HiLink javaScriptBoolean		Boolean
-HiLink javaScriptRegexpString		String
+hi def link javaScriptComment		Comment
+hi def link javaScriptLineComment		Comment
+hi def link javaScriptCommentTodo		Todo
+hi def link javaScriptSpecial		Special
+hi def link javaScriptStringS		String
+hi def link javaScriptStringD		String
+hi def link javaScriptCharacter		Character
+hi def link javaScriptSpecialCharacter	javaScriptSpecial
+hi def link javaScriptNumber		javaScriptValue
+hi def link javaScriptConditional		Conditional
+hi def link javaScriptRepeat		Repeat
+hi def link javaScriptBranch		Conditional
+hi def link javaScriptOperator		Operator
+hi def link javaScriptType			Type
+hi def link javaScriptStatement		Statement
+hi def link javaScriptFunction		Function
+hi def link javaScriptBraces		Function
+hi def link javaScriptError		Error
+hi def link javaScrParenError		javaScriptError
+hi def link javaScriptNull			Keyword
+hi def link javaScriptBoolean		Boolean
+hi def link javaScriptRegexpString		String
 
-HiLink javaScriptIdentifier		Identifier
-HiLink javaScriptLabel		Label
-HiLink javaScriptException		Exception
-HiLink javaScriptMessage		Keyword
-HiLink javaScriptGlobal		Keyword
-HiLink javaScriptMember		Keyword
-HiLink javaScriptDeprecated		Exception 
-HiLink javaScriptReserved		Keyword
-HiLink javaScriptDebug		Debug
-HiLink javaScriptConstant		Label
+hi def link javaScriptIdentifier		Identifier
+hi def link javaScriptLabel		Label
+hi def link javaScriptException		Exception
+hi def link javaScriptMessage		Keyword
+hi def link javaScriptGlobal		Keyword
+hi def link javaScriptMember		Keyword
+hi def link javaScriptDeprecated		Exception 
+hi def link javaScriptReserved		Keyword
+hi def link javaScriptDebug		Debug
+hi def link javaScriptConstant		Label
 
-delcommand HiLink
 
 let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
diff --git a/runtime/syntax/jess.vim b/runtime/syntax/jess.vim
--- a/runtime/syntax/jess.vim
+++ b/runtime/syntax/jess.vim
@@ -119,27 +119,25 @@ syn sync lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jessAtomNmbr	jessNumber
-HiLink jessAtomMark	jessMark
+hi def link jessAtomNmbr	jessNumber
+hi def link jessAtomMark	jessMark
 
-HiLink jessAtom		Identifier
-HiLink jessAtomBarSymbol	Special
-HiLink jessBarSymbol	Special
-HiLink jessComment	Comment
-HiLink jessConcat	Statement
-HiLink jessDeclaration	Statement
-HiLink jessFunc		Statement
-HiLink jessKey		Type
-HiLink jessMark		Delimiter
-HiLink jessNumber	Number
-HiLink jessParenError	Error
-HiLink jessSpecial	Type
-HiLink jessString	String
-HiLink jessVar		Identifier
+hi def link jessAtom		Identifier
+hi def link jessAtomBarSymbol	Special
+hi def link jessBarSymbol	Special
+hi def link jessComment	Comment
+hi def link jessConcat	Statement
+hi def link jessDeclaration	Statement
+hi def link jessFunc		Statement
+hi def link jessKey		Type
+hi def link jessMark		Delimiter
+hi def link jessNumber	Number
+hi def link jessParenError	Error
+hi def link jessSpecial	Type
+hi def link jessString	String
+hi def link jessVar		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "jess"
 
diff --git a/runtime/syntax/jgraph.vim b/runtime/syntax/jgraph.vim
--- a/runtime/syntax/jgraph.vim
+++ b/runtime/syntax/jgraph.vim
@@ -34,14 +34,12 @@ syn match  jgraphNumber		 "\-\=\.\d\+\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jgraphComment	Comment
-HiLink jgraphCmd	Identifier
-HiLink jgraphType	Type
-HiLink jgraphNumber	Number
+hi def link jgraphComment	Comment
+hi def link jgraphCmd	Identifier
+hi def link jgraphType	Type
+hi def link jgraphNumber	Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "jgraph"
diff --git a/runtime/syntax/jproperties.vim b/runtime/syntax/jproperties.vim
--- a/runtime/syntax/jproperties.vim
+++ b/runtime/syntax/jproperties.vim
@@ -118,19 +118,17 @@ syn keyword jpropertiesTodo		TODO FIXME 
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jpropertiesComment	Comment
-HiLink jpropertiesTodo		Todo
-HiLink jpropertiesIdentifier	Identifier
-HiLink jpropertiesString	String
-HiLink jpropertiesExtendString	String
-HiLink jpropertiesCharacter	Character
-HiLink jpropertiesSpecial	Special
-HiLink jpropertiesSpecialChar	SpecialChar
-HiLink jpropertiesError	Error
+hi def link jpropertiesComment	Comment
+hi def link jpropertiesTodo		Todo
+hi def link jpropertiesIdentifier	Identifier
+hi def link jpropertiesString	String
+hi def link jpropertiesExtendString	String
+hi def link jpropertiesCharacter	Character
+hi def link jpropertiesSpecial	Special
+hi def link jpropertiesSpecialChar	SpecialChar
+hi def link jpropertiesError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "jproperties"
 
diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim
--- a/runtime/syntax/json.vim
+++ b/runtime/syntax/json.vim
@@ -93,30 +93,28 @@ syn region  jsonFold matchgroup=jsonBrac
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jsonPadding         Operator
-HiLink jsonString          String
-HiLink jsonTest          Label
-HiLink jsonEscape          Special
-HiLink jsonNumber          Number
-HiLink jsonBraces          Delimiter
-HiLink jsonNull            Function
-HiLink jsonBoolean         Boolean
-HiLink jsonKeyword         Label
+hi def link jsonPadding         Operator
+hi def link jsonString          String
+hi def link jsonTest          Label
+hi def link jsonEscape          Special
+hi def link jsonNumber          Number
+hi def link jsonBraces          Delimiter
+hi def link jsonNull            Function
+hi def link jsonBoolean         Boolean
+hi def link jsonKeyword         Label
 
 if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
-HiLink jsonNumError        Error
-HiLink jsonCommentError    Error
-HiLink jsonSemicolonError  Error
-HiLink jsonTrailingCommaError     Error
-HiLink jsonMissingCommaError      Error
-HiLink jsonStringSQError        	Error
-HiLink jsonNoQuotesError        	Error
-HiLink jsonTripleQuotesError     	Error
+hi def link jsonNumError        Error
+hi def link jsonCommentError    Error
+hi def link jsonSemicolonError  Error
+hi def link jsonTrailingCommaError     Error
+hi def link jsonMissingCommaError      Error
+hi def link jsonStringSQError        	Error
+hi def link jsonNoQuotesError        	Error
+hi def link jsonTripleQuotesError     	Error
 endif
-HiLink jsonQuote           Quote
-HiLink jsonNoise           Noise
-delcommand HiLink
+hi def link jsonQuote           Quote
+hi def link jsonNoise           Noise
 
 let b:current_syntax = "json"
 if main_syntax == 'json'
diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -46,20 +46,18 @@ syn region htmlTag start=+<[^/%]+ end=+>
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " java.vim has redefined htmlComment highlighting
-HiLink htmlComment	 Comment
-HiLink htmlCommentPart Comment
+hi def link htmlComment	 Comment
+hi def link htmlCommentPart Comment
 " Be consistent with html highlight settings
-HiLink jspComment	 htmlComment
-HiLink jspTag		 htmlTag
-HiLink jspDirective	 jspTag
-HiLink jspDirName	 htmlTagName
-HiLink jspDirArg	 htmlArg
-HiLink jspCommand	 jspTag
-HiLink jspCommandName  htmlTagName
-HiLink jspCommandArg	 htmlArg
-delcommand HiLink
+hi def link jspComment	 htmlComment
+hi def link jspTag		 htmlTag
+hi def link jspDirective	 jspTag
+hi def link jspDirName	 htmlTagName
+hi def link jspDirArg	 htmlArg
+hi def link jspCommand	 jspTag
+hi def link jspCommandName  htmlTagName
+hi def link jspCommandArg	 htmlArg
 
 if main_syntax == 'jsp'
   unlet main_syntax
diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim
--- a/runtime/syntax/kix.vim
+++ b/runtime/syntax/kix.vim
@@ -129,43 +129,41 @@ syn match   kixExpression	"<\|>\|<=\|>=\
 
 " Default highlighting.
 " Set default highlight only if it doesn't already have a value.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kixDoubleString		String
-HiLink kixSingleString		String
-HiLink kixStatement		Statement
-HiLink kixRepeat		Repeat
-HiLink kixComment		Comment
-HiLink kixBuiltin		Function
-HiLink kixLocalVar		Special
-HiLink kixMacro			Special
-HiLink kixEnvVar		Special
-HiLink kixLabel			Type
-HiLink kixFunction		Function
-HiLink kixInteger		Number
-HiLink kixHex			Number
-HiLink kixFloat			Number
-HiLink kixOperator		Operator
-HiLink kixExpression		Operator
+hi def link kixDoubleString		String
+hi def link kixSingleString		String
+hi def link kixStatement		Statement
+hi def link kixRepeat		Repeat
+hi def link kixComment		Comment
+hi def link kixBuiltin		Function
+hi def link kixLocalVar		Special
+hi def link kixMacro			Special
+hi def link kixEnvVar		Special
+hi def link kixLabel			Type
+hi def link kixFunction		Function
+hi def link kixInteger		Number
+hi def link kixHex			Number
+hi def link kixFloat			Number
+hi def link kixOperator		Operator
+hi def link kixExpression		Operator
 
-HiLink kixParenCloseError	Error
-HiLink kixBrackCloseError	Error
-HiLink kixStringError		Error
+hi def link kixParenCloseError	Error
+hi def link kixBrackCloseError	Error
+hi def link kixStringError		Error
 
-HiLink kixWhileError		Error
-HiLink kixWhileOK		Conditional
-HiLink kixDoError		Error
-HiLink kixDoOK			Conditional
-HiLink kixIfError		Error
-HiLink kixIfOK			Conditional
-HiLink kixSelectError		Error
-HiLink kixSelectOK		Conditional
-HiLink kixForNextError		Error
-HiLink kixForNextOK		Conditional
-HiLink kixForEachError		Error
-HiLink kixForEachOK		Conditional
+hi def link kixWhileError		Error
+hi def link kixWhileOK		Conditional
+hi def link kixDoError		Error
+hi def link kixDoOK			Conditional
+hi def link kixIfError		Error
+hi def link kixIfOK			Conditional
+hi def link kixSelectError		Error
+hi def link kixSelectOK		Conditional
+hi def link kixForNextError		Error
+hi def link kixForNextOK		Conditional
+hi def link kixForEachError		Error
+hi def link kixForEachOK		Conditional
 
-delcommand HiLink
 
 let b:current_syntax = "kix"
 
diff --git a/runtime/syntax/kscript.vim b/runtime/syntax/kscript.vim
--- a/runtime/syntax/kscript.vim
+++ b/runtime/syntax/kscript.vim
@@ -35,24 +35,22 @@ syn region	kscriptString		start=+'''+  e
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kscriptConditional		Conditional
-HiLink kscriptRepeat			Repeat
-HiLink kscriptExceptions		Statement
-HiLink kscriptFunction		Function
-HiLink kscriptConst			Constant
-HiLink kscriptStatement		Statement
-HiLink kscriptLabel			Label
-HiLink kscriptStorageClass		StorageClass
-HiLink kscriptType			Type
-HiLink kscriptTodo			Todo
-HiLink kscriptComment		Comment
-HiLink kscriptString			String
-HiLink kscriptPreCondit		PreCondit
-HiLink kscriptHardCoded		Statement
+hi def link kscriptConditional		Conditional
+hi def link kscriptRepeat			Repeat
+hi def link kscriptExceptions		Statement
+hi def link kscriptFunction		Function
+hi def link kscriptConst			Constant
+hi def link kscriptStatement		Statement
+hi def link kscriptLabel			Label
+hi def link kscriptStorageClass		StorageClass
+hi def link kscriptType			Type
+hi def link kscriptTodo			Todo
+hi def link kscriptComment		Comment
+hi def link kscriptString			String
+hi def link kscriptPreCondit		PreCondit
+hi def link kscriptHardCoded		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "kscript"
 
diff --git a/runtime/syntax/kwt.vim b/runtime/syntax/kwt.vim
--- a/runtime/syntax/kwt.vim
+++ b/runtime/syntax/kwt.vim
@@ -52,18 +52,16 @@ syn region kwtRewBody		transparent keepe
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kwtStatement	cppStatement
-HiLink kwtDecl	cppStatement
-HiLink kwtCast	cppStatement
-HiLink kwtSep	Delimiter
-HiLink kwtViews	Label
-HiLink kwtPhylum	Type
-HiLink kwtOption	PreProc
-"HiLink cText	Comment
+hi def link kwtStatement	cppStatement
+hi def link kwtDecl	cppStatement
+hi def link kwtCast	cppStatement
+hi def link kwtSep	Delimiter
+hi def link kwtViews	Label
+hi def link kwtPhylum	Type
+hi def link kwtOption	PreProc
+"hi def link cText	Comment
 
-delcommand HiLink
 
 syn sync lines=300
 
diff --git a/runtime/syntax/lace.vim b/runtime/syntax/lace.vim
--- a/runtime/syntax/lace.vim
+++ b/runtime/syntax/lace.vim
@@ -83,41 +83,39 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink laceTopStruct			PreProc
+hi def link laceTopStruct			PreProc
 
-HiLink laceOptionClause		Statement
-HiLink laceOptionMark			Constant
-HiLink laceClusterProp		Label
-HiLink laceAdaptClassName		Label
-HiLink laceExternal			Statement
-HiLink laceCluster			ModeMsg
+hi def link laceOptionClause		Statement
+hi def link laceOptionMark			Constant
+hi def link laceClusterProp		Label
+hi def link laceAdaptClassName		Label
+hi def link laceExternal			Statement
+hi def link laceCluster			ModeMsg
 
-HiLink laceEscape				Special
+hi def link laceEscape				Special
 
-HiLink laceBool				Boolean
-HiLink laceString				String
-HiLink laceCharacter			Character
-HiLink laceClassName			Type
-HiLink laceNumber				Number
+hi def link laceBool				Boolean
+hi def link laceString				String
+hi def link laceCharacter			Character
+hi def link laceClassName			Type
+hi def link laceNumber				Number
 
-HiLink laceOperator			Special
-HiLink laceArray				Special
-HiLink laceExport				Special
-HiLink laceCreation			Special
-HiLink laceBrackets			Special
-HiLink laceConstraint			Special
+hi def link laceOperator			Special
+hi def link laceArray				Special
+hi def link laceExport				Special
+hi def link laceCreation			Special
+hi def link laceBrackets			Special
+hi def link laceConstraint			Special
 
-HiLink laceComment			Comment
+hi def link laceComment			Comment
 
-HiLink laceError				Error
-HiLink laceStringError		Error
-HiLink laceParenError			Error
-HiLink laceBracketError		Error
-HiLink laceTodo				Todo
+hi def link laceError				Error
+hi def link laceStringError		Error
+hi def link laceParenError			Error
+hi def link laceBracketError		Error
+hi def link laceTodo				Todo
 
-delcommand HiLink
 
 let b:current_syntax = "lace"
 
diff --git a/runtime/syntax/latte.vim b/runtime/syntax/latte.vim
--- a/runtime/syntax/latte.vim
+++ b/runtime/syntax/latte.vim
@@ -64,20 +64,18 @@ syn sync match matchPlace grouphere NONE
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink latteSyntax		Statement
-HiLink latteVar			Function
+hi def link latteSyntax		Statement
+hi def link latteVar			Function
 
-HiLink latteString		String
-HiLink latteQuote			String
+hi def link latteString		String
+hi def link latteQuote			String
 
-HiLink latteDelimiter		Delimiter
-HiLink latteOperator		Operator
+hi def link latteDelimiter		Delimiter
+hi def link latteOperator		Operator
 
-HiLink latteComment		Comment
-HiLink latteError			Error
+hi def link latteComment		Comment
+hi def link latteError			Error
 
-delcommand HiLink
 
 let b:current_syntax = "latte"
diff --git a/runtime/syntax/ldif.vim b/runtime/syntax/ldif.vim
--- a/runtime/syntax/ldif.vim
+++ b/runtime/syntax/ldif.vim
@@ -20,16 +20,14 @@ syn region ldifFileValue   matchgroup=ld
 
 syn region ldifComment start=/^#/ end=/\_$/ skip=/\n /
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ldifAttribute		Type
-HiLink ldifOption		Identifier
-HiLink ldifPunctuation	Normal
-HiLink ldifStringValue	String
-HiLink ldifBase64Value	Special
-HiLink ldifFileValue		Special
-HiLink ldifComment		Comment
+hi def link ldifAttribute		Type
+hi def link ldifOption		Identifier
+hi def link ldifPunctuation	Normal
+hi def link ldifStringValue	String
+hi def link ldifBase64Value	Special
+hi def link ldifFileValue		Special
+hi def link ldifComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ldif"
diff --git a/runtime/syntax/lex.vim b/runtime/syntax/lex.vim
--- a/runtime/syntax/lex.vim
+++ b/runtime/syntax/lex.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Lex
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Nov 14, 2012
-" Version:	14
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	16
+" URL:	http://mysite.verizon.net/astronaut/vim/index.html#SYNTAX_LEX
 "
 " Option:
 "   lex_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -119,22 +119,24 @@ syn sync match lexSyncPat	groupthere lex
 syn sync match lexSyncPat	groupthere lexPatBlock	"^%%$"
 
 " The default highlighting.
-hi def link lexAbbrvComment	lexPatComment
-hi def link lexAbbrvRegExp	Macro
-hi def link lexAbbrv	SpecialChar
-hi def link lexBrace	lexPat
-hi def link lexCFunctions	Function
-hi def link lexCstruct	cStructure
-hi def link lexMorePat	SpecialChar
-hi def link lexOptions	PreProc
-hi def link lexPatComment	Comment
-hi def link lexPat		Function
-hi def link lexPatString	Function
-hi def link lexPatTag	Special
-hi def link lexPatTagZone	lexPatTag
-hi def link lexSep		Delimiter
-hi def link lexSlashQuote	lexPat
-hi def link lexStartState	Statement
+if !exists("skip_lex_syntax_inits")
+ hi def link lexAbbrvComment	lexPatComment
+ hi def link lexAbbrvRegExp	Macro
+ hi def link lexAbbrv	SpecialChar
+ hi def link lexBrace	lexPat
+ hi def link lexCFunctions	Function
+ hi def link lexCstruct	cStructure
+ hi def link lexMorePat	SpecialChar
+ hi def link lexOptions	PreProc
+ hi def link lexPatComment	Comment
+ hi def link lexPat		Function
+ hi def link lexPatString	Function
+ hi def link lexPatTag	Special
+ hi def link lexPatTagZone	lexPatTag
+ hi def link lexSep		Delimiter
+ hi def link lexSlashQuote	lexPat
+ hi def link lexStartState	Statement
+endif
 
 let b:current_syntax = "lex"
 
diff --git a/runtime/syntax/lhaskell.vim b/runtime/syntax/lhaskell.vim
--- a/runtime/syntax/lhaskell.vim
+++ b/runtime/syntax/lhaskell.vim
@@ -104,14 +104,12 @@ syntax region beginCodeCode  matchgroup=
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lhsBirdTrack Comment
+hi def link lhsBirdTrack Comment
 
-HiLink beginCodeBegin	      texCmdName
-HiLink beginCodeCode	      texSection
+hi def link beginCodeBegin	      texCmdName
+hi def link beginCodeCode	      texSection
 
-delcommand HiLink
 
 " Restore cursor to original position, as it may have been disturbed
 " by the searches in our guessing code
diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim
--- a/runtime/syntax/lifelines.vim
+++ b/runtime/syntax/lifelines.vim
@@ -122,34 +122,32 @@ syn match	lifelinesErrInParen	contained 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lifelinesConditional	Conditional
-HiLink lifelinesArithm	Operator
-HiLink lifelinesLogical	Conditional
-HiLink lifelinesInclude	Include
-HiLink lifelinesComment	Comment
-HiLink lifelinesStatement	Statement
-HiLink lifelinesUser		Statement
-HiLink lifelinesFunct		Statement
-HiLink lifelinesTable		Statement
-HiLink lifelinesGedcom	Statement
-HiLink lifelinesList		Statement
-HiLink lifelinesRepeat	Repeat
-HiLink lifelinesFam		Statement
-HiLink lifelinesIndi		Statement
-HiLink lifelinesProc		Statement
-HiLink lifelinesDef		Statement
-HiLink lifelinesString	String
-HiLink lifelinesSpecial	Special
-HiLink lifelinesNumber	Number
-HiLink lifelinesParenError	Error
-HiLink lifelinesErrInParen	Error
-HiLink lifelinesError		Error
-HiLink lifelinesTodo		Todo
-HiLink lifelinesDecl		PreProc
+hi def link lifelinesConditional	Conditional
+hi def link lifelinesArithm	Operator
+hi def link lifelinesLogical	Conditional
+hi def link lifelinesInclude	Include
+hi def link lifelinesComment	Comment
+hi def link lifelinesStatement	Statement
+hi def link lifelinesUser		Statement
+hi def link lifelinesFunct		Statement
+hi def link lifelinesTable		Statement
+hi def link lifelinesGedcom	Statement
+hi def link lifelinesList		Statement
+hi def link lifelinesRepeat	Repeat
+hi def link lifelinesFam		Statement
+hi def link lifelinesIndi		Statement
+hi def link lifelinesProc		Statement
+hi def link lifelinesDef		Statement
+hi def link lifelinesString	String
+hi def link lifelinesSpecial	Special
+hi def link lifelinesNumber	Number
+hi def link lifelinesParenError	Error
+hi def link lifelinesErrInParen	Error
+hi def link lifelinesError		Error
+hi def link lifelinesTodo		Todo
+hi def link lifelinesDecl		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "lifelines"
 
diff --git a/runtime/syntax/lilo.vim b/runtime/syntax/lilo.vim
--- a/runtime/syntax/lilo.vim
+++ b/runtime/syntax/lilo.vim
@@ -119,58 +119,56 @@ syn match liloDecNumberPListComment "#.*
 syn match liloAnythingComment "#.*$" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink liloEqPath             liloEquals
-HiLink liloEqWord             liloEquals
-HiLink liloEqVga              liloEquals
-HiLink liloEqDecNumber        liloEquals
-HiLink liloEqHexNumber        liloEquals
-HiLink liloEqNumber           liloEquals
-HiLink liloEqString           liloEquals
-HiLink liloEqAnything         liloEquals
-HiLink liloEquals             Special
+hi def link liloEqPath             liloEquals
+hi def link liloEqWord             liloEquals
+hi def link liloEqVga              liloEquals
+hi def link liloEqDecNumber        liloEquals
+hi def link liloEqHexNumber        liloEquals
+hi def link liloEqNumber           liloEquals
+hi def link liloEqString           liloEquals
+hi def link liloEqAnything         liloEquals
+hi def link liloEquals             Special
 
-HiLink liloError              Error
+hi def link liloError              Error
 
-HiLink liloEqPathComment      liloComment
-HiLink liloEqVgaComment       liloComment
-HiLink liloEqDecNumberComment liloComment
-HiLink liloEqHexNumberComment liloComment
-HiLink liloEqStringComment    liloComment
-HiLink liloEqAnythingComment  liloComment
-HiLink liloPathComment        liloComment
-HiLink liloVgaComment         liloComment
-HiLink liloDecNumberComment   liloComment
-HiLink liloHexNumberComment   liloComment
-HiLink liloNumberComment      liloComment
-HiLink liloStringComment      liloComment
-HiLink liloAnythingComment    liloComment
-HiLink liloComment            Comment
-
-HiLink liloDiskOpt            liloOption
-HiLink liloKernelOpt          liloOption
-HiLink liloImageOpt           liloOption
-HiLink liloOption             Keyword
+hi def link liloEqPathComment      liloComment
+hi def link liloEqVgaComment       liloComment
+hi def link liloEqDecNumberComment liloComment
+hi def link liloEqHexNumberComment liloComment
+hi def link liloEqStringComment    liloComment
+hi def link liloEqAnythingComment  liloComment
+hi def link liloPathComment        liloComment
+hi def link liloVgaComment         liloComment
+hi def link liloDecNumberComment   liloComment
+hi def link liloHexNumberComment   liloComment
+hi def link liloNumberComment      liloComment
+hi def link liloStringComment      liloComment
+hi def link liloAnythingComment    liloComment
+hi def link liloComment            Comment
 
-HiLink liloDecNumber          liloNumber
-HiLink liloHexNumber          liloNumber
-HiLink liloDecNumberP         liloNumber
-HiLink liloNumber             Number
-HiLink liloString             String
-HiLink liloPath               Constant
+hi def link liloDiskOpt            liloOption
+hi def link liloKernelOpt          liloOption
+hi def link liloImageOpt           liloOption
+hi def link liloOption             Keyword
+
+hi def link liloDecNumber          liloNumber
+hi def link liloHexNumber          liloNumber
+hi def link liloDecNumberP         liloNumber
+hi def link liloNumber             Number
+hi def link liloString             String
+hi def link liloPath               Constant
 
-HiLink liloSpecial            Special
-HiLink liloLabel              Title
-HiLink liloDecNumberList      Special
-HiLink liloDecNumberPList     Special
-HiLink liloAnything           Normal
-HiLink liloEnviron            Identifier
-HiLink liloVgaKeyword         Identifier
-HiLink liloImage              Type
-HiLink liloChRules            Preproc
-HiLink liloDisk               Preproc
+hi def link liloSpecial            Special
+hi def link liloLabel              Title
+hi def link liloDecNumberList      Special
+hi def link liloDecNumberPList     Special
+hi def link liloAnything           Normal
+hi def link liloEnviron            Identifier
+hi def link liloVgaKeyword         Identifier
+hi def link liloImage              Type
+hi def link liloChRules            Preproc
+hi def link liloDisk               Preproc
 
-delcommand HiLink
 
 let b:current_syntax = "lilo"
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -2,7 +2,7 @@
 " Language:    Lisp
 " Maintainer:  Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
 " Last Change: May 02, 2016
-" Version:     25
+" Version:     26
 " URL:	       http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@@ -561,58 +561,57 @@ syn sync lines=100
 
 " ---------------------------------------------------------------------
 " Define Highlighting: {{{1
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_lisp_syntax_inits")
 
-HiLink lispCommentRegion	lispComment
-HiLink lispAtomNmbr		lispNumber
-HiLink lispAtomMark		lispMark
-HiLink lispInStringString	lispString
+  hi def link lispCommentRegion	lispComment
+  hi def link lispAtomNmbr		lispNumber
+  hi def link lispAtomMark		lispMark
+  hi def link lispInStringString	lispString
 
-HiLink lispAtom		Identifier
-HiLink lispAtomBarSymbol	Special
-HiLink lispBarSymbol		Special
-HiLink lispComment		Comment
-HiLink lispConcat		Statement
-HiLink lispDecl		Statement
-HiLink lispFunc		Statement
-HiLink lispKey		Type
-HiLink lispMark		Delimiter
-HiLink lispNumber		Number
-HiLink lispParenError		Error
-HiLink lispEscapeSpecial	Type
-HiLink lispString		String
-HiLink lispTodo		Todo
-HiLink lispVar		Statement
+  hi def link lispAtom		Identifier
+  hi def link lispAtomBarSymbol	Special
+  hi def link lispBarSymbol		Special
+  hi def link lispComment		Comment
+  hi def link lispConcat		Statement
+  hi def link lispDecl		Statement
+  hi def link lispFunc		Statement
+  hi def link lispKey		Type
+  hi def link lispMark		Delimiter
+  hi def link lispNumber		Number
+  hi def link lispParenError		Error
+  hi def link lispEscapeSpecial	Type
+  hi def link lispString		String
+  hi def link lispTodo		Todo
+  hi def link lispVar		Statement
 
-if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
- if &bg == "dark"
-  hi def hlLevel0 ctermfg=red         guifg=red1
-  hi def hlLevel1 ctermfg=yellow      guifg=orange1
-  hi def hlLevel2 ctermfg=green       guifg=yellow1
-  hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
-  hi def hlLevel4 ctermfg=magenta     guifg=green1
-  hi def hlLevel5 ctermfg=red         guifg=springgreen1
-  hi def hlLevel6 ctermfg=yellow      guifg=cyan1
-  hi def hlLevel7 ctermfg=green       guifg=slateblue1
-  hi def hlLevel8 ctermfg=cyan        guifg=magenta1
-  hi def hlLevel9 ctermfg=magenta     guifg=purple1
- else
-  hi def hlLevel0 ctermfg=red         guifg=red3
-  hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
-  hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
-  hi def hlLevel3 ctermfg=blue        guifg=yellow3
-  hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
-  hi def hlLevel5 ctermfg=red         guifg=green4
-  hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
-  hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
-  hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
-  hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
- endif
+  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+   if &bg == "dark"
+    hi def hlLevel0 ctermfg=red         guifg=red1
+    hi def hlLevel1 ctermfg=yellow      guifg=orange1
+    hi def hlLevel2 ctermfg=green       guifg=yellow1
+    hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
+    hi def hlLevel4 ctermfg=magenta     guifg=green1
+    hi def hlLevel5 ctermfg=red         guifg=springgreen1
+    hi def hlLevel6 ctermfg=yellow      guifg=cyan1
+    hi def hlLevel7 ctermfg=green       guifg=slateblue1
+    hi def hlLevel8 ctermfg=cyan        guifg=magenta1
+    hi def hlLevel9 ctermfg=magenta     guifg=purple1
+   else
+    hi def hlLevel0 ctermfg=red         guifg=red3
+    hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
+    hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
+    hi def hlLevel3 ctermfg=blue        guifg=yellow3
+    hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+    hi def hlLevel5 ctermfg=red         guifg=green4
+    hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
+    hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
+    hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
+    hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+   endif
+  endif
+
 endif
 
-delcommand HiLink
-
 let b:current_syntax = "lisp"
 
 " ---------------------------------------------------------------------
diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim
--- a/runtime/syntax/lite.vim
+++ b/runtime/syntax/lite.vim
@@ -136,30 +136,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink liteComment		Comment
-HiLink liteString		String
-HiLink liteNumber		Number
-HiLink liteFloat		Float
-HiLink liteIdentifier	Identifier
-HiLink liteGlobalIdentifier	Identifier
-HiLink liteIntVar		Identifier
-HiLink liteFunctions		Function
-HiLink liteRepeat		Repeat
-HiLink liteConditional	Conditional
-HiLink liteStatement		Statement
-HiLink liteType		Type
-HiLink liteInclude		Include
-HiLink liteDefine		Define
-HiLink liteSpecialChar	SpecialChar
-HiLink liteParentError	liteError
-HiLink liteError		Error
-HiLink liteTodo		Todo
-HiLink liteOperator		Operator
-HiLink liteRelation		Operator
+hi def link liteComment		Comment
+hi def link liteString		String
+hi def link liteNumber		Number
+hi def link liteFloat		Float
+hi def link liteIdentifier	Identifier
+hi def link liteGlobalIdentifier	Identifier
+hi def link liteIntVar		Identifier
+hi def link liteFunctions		Function
+hi def link liteRepeat		Repeat
+hi def link liteConditional	Conditional
+hi def link liteStatement		Statement
+hi def link liteType		Type
+hi def link liteInclude		Include
+hi def link liteDefine		Define
+hi def link liteSpecialChar	SpecialChar
+hi def link liteParentError	liteError
+hi def link liteError		Error
+hi def link liteTodo		Todo
+hi def link liteOperator		Operator
+hi def link liteRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "lite"
 
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -387,48 +387,46 @@ syn sync ccomment logtalkBlockComment ma
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	logtalkBlockComment	Comment
-HiLink	logtalkLineComment	Comment
+hi def link logtalkBlockComment	Comment
+hi def link logtalkLineComment	Comment
 
-HiLink	logtalkOpenEntityDir	Normal
-HiLink	logtalkOpenEntityDirTag	PreProc
+hi def link logtalkOpenEntityDir	Normal
+hi def link logtalkOpenEntityDirTag	PreProc
 
-HiLink	logtalkIfContainer	PreProc
-HiLink	logtalkIf		PreProc
-HiLink	logtalkElseIf		PreProc
-HiLink	logtalkElse		PreProc
+hi def link logtalkIfContainer	PreProc
+hi def link logtalkIf		PreProc
+hi def link logtalkElseIf		PreProc
+hi def link logtalkElse		PreProc
 
-HiLink	logtalkEntity		Normal
+hi def link logtalkEntity		Normal
 
-HiLink	logtalkEntityRel	Normal
-HiLink	logtalkEntityRelTag	PreProc
+hi def link logtalkEntityRel	Normal
+hi def link logtalkEntityRelTag	PreProc
 
-HiLink	logtalkCloseEntityDir	PreProc
+hi def link logtalkCloseEntityDir	PreProc
 
-HiLink	logtalkDir		Normal
-HiLink	logtalkDirTag		PreProc
+hi def link logtalkDir		Normal
+hi def link logtalkDirTag		PreProc
 
-HiLink	logtalkAtom		String
-HiLink	logtalkString		String
-HiLink	logtalkEscapeSequence	SpecialChar
+hi def link logtalkAtom		String
+hi def link logtalkString		String
+hi def link logtalkEscapeSequence	SpecialChar
 
-HiLink	logtalkNumber		Number
+hi def link logtalkNumber		Number
 
-HiLink	logtalkKeyword		Keyword
+hi def link logtalkKeyword		Keyword
 
-HiLink	logtalkBuiltIn		Keyword
-HiLink	logtalkBuiltInMethod	Keyword
+hi def link logtalkBuiltIn		Keyword
+hi def link logtalkBuiltInMethod	Keyword
 
-HiLink	logtalkOperator		Operator
+hi def link logtalkOperator		Operator
 
-HiLink	logtalkExtCall		Normal
-HiLink	logtalkExtCallTag	Operator
+hi def link logtalkExtCall		Normal
+hi def link logtalkExtCallTag	Operator
 
-HiLink	logtalkVariable		Identifier
+hi def link logtalkVariable		Identifier
 
-delcommand HiLink
 
 
 let b:current_syntax = "logtalk"
diff --git a/runtime/syntax/lotos.vim b/runtime/syntax/lotos.vim
--- a/runtime/syntax/lotos.vim
+++ b/runtime/syntax/lotos.vim
@@ -54,17 +54,15 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lotosStatement		Statement
-HiLink lotosProcess		Label
-HiLink lotosOperator		Operator
-HiLink lotosSort		Function
-HiLink lotosType		Type
-HiLink lotosComment		Comment
-HiLink lotosDelimiter		String
+hi def link lotosStatement		Statement
+hi def link lotosProcess		Label
+hi def link lotosOperator		Operator
+hi def link lotosSort		Function
+hi def link lotosType		Type
+hi def link lotosComment		Comment
+hi def link lotosDelimiter		String
 
-delcommand HiLink
 
 let b:current_syntax = "lotos"
 
diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim
--- a/runtime/syntax/lout.vim
+++ b/runtime/syntax/lout.vim
@@ -100,35 +100,32 @@ syn region loutHeadings matchgroup=loutH
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overrriden later.
-HiLink loutTodo Todo
-HiLink loutDefine Define
-HiLink loutEOmlDef Define
-HiLink loutFunction Function
-HiLink loutBraceError Error
-HiLink loutNULL Special
-HiLink loutComment Comment
-HiLink loutSpecial Special
-HiLink loutSymbols Character
-HiLink loutInclude Include
-HiLink loutKeyword Keyword
-HiLink loutTag Tag
-HiLink loutMath Number
+hi def link loutTodo Todo
+hi def link loutDefine Define
+hi def link loutEOmlDef Define
+hi def link loutFunction Function
+hi def link loutBraceError Error
+hi def link loutNULL Special
+hi def link loutComment Comment
+hi def link loutSpecial Special
+hi def link loutSymbols Character
+hi def link loutInclude Include
+hi def link loutKeyword Keyword
+hi def link loutTag Tag
+hi def link loutMath Number
 
-" HiLink Not really needed here, but I think it is more consistent.
-HiLink loutMBraces loutMath
+hi def link loutMBraces loutMath
 hi loutItalic term=italic cterm=italic gui=italic
-HiLink loutIBraces loutItalic
+hi def link loutIBraces loutItalic
 hi loutBold term=bold cterm=bold gui=bold
-HiLink loutBBraces loutBold
+hi def link loutBBraces loutBold
 hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
-HiLink loutBIBraces loutBoldItalic
+hi def link loutBIBraces loutBoldItalic
 hi loutHeadings term=bold cterm=bold guifg=indianred
-HiLink loutHeads loutHeadings
+hi def link loutHeads loutHeadings
 
-delcommand HiLink
 
 let b:current_syntax = "lout"
 
diff --git a/runtime/syntax/lpc.vim b/runtime/syntax/lpc.vim
--- a/runtime/syntax/lpc.vim
+++ b/runtime/syntax/lpc.vim
@@ -2,7 +2,7 @@
 " Language:	LPC
 " Maintainer:	Shizhu Pan <poet@mudbuilder.net>
 " URL:		http://poet.tomud.com/pub/lpc.vim.bz2
-" Last Change:	2011 Dec 10 by Thilo Six
+" Last Change:	2016 Aug 31
 " Comments:	If you are using Vim 6.2 or later, see :h lpc.vim for
 "		file type recognizing, if not, you had to use modeline.
 
@@ -358,85 +358,83 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lpcModifier		lpcStorageClass
+hi def link lpcModifier		lpcStorageClass
 
-HiLink lpcQuotedFmt		lpcFormat
-HiLink lpcFormat		lpcSpecial
-HiLink lpcCppString		lpcString	" Cpp means
+hi def link lpcQuotedFmt		lpcFormat
+hi def link lpcFormat		lpcSpecial
+hi def link lpcCppString		lpcString	" Cpp means
 					      " C Pre-Processor
-HiLink lpcCommentL		lpcComment
-HiLink lpcCommentStart	lpcComment
-HiLink lpcUserLabel		lpcLabel
-HiLink lpcSpecialCharacter	lpcSpecial
-HiLink lpcOctal		lpcPreProc
-HiLink lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
+hi def link lpcCommentL		lpcComment
+hi def link lpcCommentStart	lpcComment
+hi def link lpcUserLabel		lpcLabel
+hi def link lpcSpecialCharacter	lpcSpecial
+hi def link lpcOctal		lpcPreProc
+hi def link lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
 					  " as decimals, programmers should
 					  " be aware of that.
-HiLink lpcEfunError		lpcError
-HiLink lpcKeywdError		lpcError
-HiLink lpcOctalError		lpcError
-HiLink lpcParenError		lpcError
-HiLink lpcErrInParen		lpcError
-HiLink lpcErrInBracket	lpcError
-HiLink lpcCommentError	lpcError
-HiLink lpcCommentStartError	lpcError
-HiLink lpcSpaceError		lpcError
-HiLink lpcSpecialError	lpcError
-HiLink lpcErrFunc		lpcError
+hi def link lpcEfunError		lpcError
+hi def link lpcKeywdError		lpcError
+hi def link lpcOctalError		lpcError
+hi def link lpcParenError		lpcError
+hi def link lpcErrInParen		lpcError
+hi def link lpcErrInBracket	lpcError
+hi def link lpcCommentError	lpcError
+hi def link lpcCommentStartError	lpcError
+hi def link lpcSpaceError		lpcError
+hi def link lpcSpecialError	lpcError
+hi def link lpcErrFunc		lpcError
 
 if exists("lpc_pre_v22")
-    HiLink lpcOldEfuns	lpc_efuns
-    HiLink lpcNewEfuns	lpcError
+    hi def link lpcOldEfuns	lpc_efuns
+    hi def link lpcNewEfuns	lpcError
 else
-    HiLink lpcOldEfuns	lpcReserved
-    HiLink lpcNewEfuns	lpc_efuns
+    hi def link lpcOldEfuns	lpcReserved
+    hi def link lpcNewEfuns	lpc_efuns
 endif
-HiLink lpc_efuns		lpcFunction
+hi def link lpc_efuns		lpcFunction
 
-HiLink lpcReserved		lpcPreProc
-HiLink lpcTextString		lpcString   " This should be preprocessors, but
-HiLink lpcArrayString		lpcPreProc  " let's make some difference
+hi def link lpcReserved		lpcPreProc
+hi def link lpcTextString		lpcString   " This should be preprocessors, but
+hi def link lpcArrayString		lpcPreProc  " let's make some difference
 					  " between text and array
 
-HiLink lpcIncluded		lpcString
-HiLink lpcCommentString	lpcString
-HiLink lpcComment2String	lpcString
-HiLink lpcCommentSkip		lpcComment
-HiLink lpcCommentFunc		lpcComment
+hi def link lpcIncluded		lpcString
+hi def link lpcCommentString	lpcString
+hi def link lpcComment2String	lpcString
+hi def link lpcCommentSkip		lpcComment
+hi def link lpcCommentFunc		lpcComment
 
-HiLink lpcCppSkip		lpcCppOut
-HiLink lpcCppOut2		lpcCppOut
-HiLink lpcCppOut		lpcComment
+hi def link lpcCppSkip		lpcCppOut
+hi def link lpcCppOut2		lpcCppOut
+hi def link lpcCppOut		lpcComment
 
 " Standard type below
-HiLink lpcApplies		Special
-HiLink lpcCharacter		Character
-HiLink lpcComment		Comment
-HiLink lpcConditional		Conditional
-HiLink lpcConstant		Constant
-HiLink lpcDefine		Macro
-HiLink lpcError		Error
-HiLink lpcFloat		Float
-HiLink lpcFunction		Function
-HiLink lpcIdentifier		Identifier
-HiLink lpcInclude		Include
-HiLink lpcLabel		Label
-HiLink lpcNumber		Number
-HiLink lpcOperator		Operator
-HiLink lpcPreCondit		PreCondit
-HiLink lpcPreProc		PreProc
-HiLink lpcRepeat		Repeat
-HiLink lpcStatement		Statement
-HiLink lpcStorageClass	StorageClass
-HiLink lpcString		String
-HiLink lpcStructure		Structure
-HiLink lpcSpecial		LineNr
-HiLink lpcTodo		Todo
-HiLink lpcType		Type
+hi def link lpcApplies		Special
+hi def link lpcCharacter		Character
+hi def link lpcComment		Comment
+hi def link lpcConditional		Conditional
+hi def link lpcConstant		Constant
+hi def link lpcDefine		Macro
+hi def link lpcError		Error
+hi def link lpcFloat		Float
+hi def link lpcFunction		Function
+hi def link lpcIdentifier		Identifier
+hi def link lpcInclude		Include
+hi def link lpcLabel		Label
+hi def link lpcNumber		Number
+hi def link lpcOperator		Operator
+hi def link lpcPreCondit		PreCondit
+hi def link lpcPreProc		PreProc
+hi def link lpcRepeat		Repeat
+hi def link lpcStatement		Statement
+hi def link lpcStorageClass	StorageClass
+hi def link lpcString		String
+hi def link lpcStructure		Structure
+hi def link lpcSpecial		LineNr
+hi def link lpcTodo		Todo
+hi def link lpcType		Type
 
-delcommand HiLink
 
 " Nodule: This is the end nodule. {{{1
 
diff --git a/runtime/syntax/lprolog.vim b/runtime/syntax/lprolog.vim
--- a/runtime/syntax/lprolog.vim
+++ b/runtime/syntax/lprolog.vim
@@ -94,32 +94,30 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lprologComment     Comment
-HiLink lprologTodo	    Todo
+hi def link lprologComment     Comment
+hi def link lprologTodo	    Todo
 
-HiLink lprologKeyword     Keyword
-HiLink lprologSpecial     Special
-HiLink lprologOperator    Operator
-HiLink lprologIdentifier  Normal
+hi def link lprologKeyword     Keyword
+hi def link lprologSpecial     Special
+hi def link lprologOperator    Operator
+hi def link lprologIdentifier  Normal
 
-HiLink lprologInteger     Number
-HiLink lprologReal	    Number
-HiLink lprologString	    String
+hi def link lprologInteger     Number
+hi def link lprologReal	    Number
+hi def link lprologString	    String
 
-HiLink lprologCommentErr  Error
-HiLink lprologBrackErr    Error
-HiLink lprologParenErr    Error
+hi def link lprologCommentErr  Error
+hi def link lprologBrackErr    Error
+hi def link lprologParenErr    Error
 
-HiLink lprologModuleName  Special
-HiLink lprologTypeName    Identifier
+hi def link lprologModuleName  Special
+hi def link lprologTypeName    Identifier
 
-HiLink lprologVariable    Keyword
-HiLink lprologAtom	    Normal
-HiLink lprologClause	    Type
+hi def link lprologVariable    Keyword
+hi def link lprologAtom	    Normal
+hi def link lprologClause	    Type
 
-delcommand HiLink
 
 let b:current_syntax = "lprolog"
 
diff --git a/runtime/syntax/lscript.vim b/runtime/syntax/lscript.vim
--- a/runtime/syntax/lscript.vim
+++ b/runtime/syntax/lscript.vim
@@ -177,25 +177,23 @@ syn match   lscriptTypeSpecifier	"[a-zA-
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi lscriptNotesType	term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 
-HiLink lscriptNotesConst	lscriptNotesType
-HiLink lscriptLineNumber	Comment
-HiLink lscriptDatatype	Type
-HiLink lscriptNumber		Number
-HiLink lscriptError		Error
-HiLink lscriptStatement	Statement
-HiLink lscriptString		String
-HiLink lscriptComment		Comment
-HiLink lscriptTodo		Todo
-HiLink lscriptFunction	Identifier
-HiLink lscriptMethods		PreProc
-HiLink lscriptEvents		Special
-HiLink lscriptTypeSpecifier	Type
+hi def link lscriptNotesConst	lscriptNotesType
+hi def link lscriptLineNumber	Comment
+hi def link lscriptDatatype	Type
+hi def link lscriptNumber		Number
+hi def link lscriptError		Error
+hi def link lscriptStatement	Statement
+hi def link lscriptString		String
+hi def link lscriptComment		Comment
+hi def link lscriptTodo		Todo
+hi def link lscriptFunction	Identifier
+hi def link lscriptMethods		PreProc
+hi def link lscriptEvents		Special
+hi def link lscriptTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "lscript"
 
diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim
--- a/runtime/syntax/lua.vim
+++ b/runtime/syntax/lua.vim
@@ -323,31 +323,29 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink luaStatement		Statement
-HiLink luaRepeat		Repeat
-HiLink luaFor			Repeat
-HiLink luaString		String
-HiLink luaString2		String
-HiLink luaNumber		Number
-HiLink luaOperator		Operator
-HiLink luaIn			Operator
-HiLink luaConstant		Constant
-HiLink luaCond		Conditional
-HiLink luaElse		Conditional
-HiLink luaFunction		Function
-HiLink luaComment		Comment
-HiLink luaTodo		Todo
-HiLink luaTable		Structure
-HiLink luaError		Error
-HiLink luaParenError		Error
-HiLink luaBraceError		Error
-HiLink luaSpecial		SpecialChar
-HiLink luaFunc		Identifier
-HiLink luaLabel		Label
+hi def link luaStatement		Statement
+hi def link luaRepeat		Repeat
+hi def link luaFor			Repeat
+hi def link luaString		String
+hi def link luaString2		String
+hi def link luaNumber		Number
+hi def link luaOperator		Operator
+hi def link luaIn			Operator
+hi def link luaConstant		Constant
+hi def link luaCond		Conditional
+hi def link luaElse		Conditional
+hi def link luaFunction		Function
+hi def link luaComment		Comment
+hi def link luaTodo		Todo
+hi def link luaTable		Structure
+hi def link luaError		Error
+hi def link luaParenError		Error
+hi def link luaBraceError		Error
+hi def link luaSpecial		SpecialChar
+hi def link luaFunc		Identifier
+hi def link luaLabel		Label
 
-delcommand HiLink
 
 let b:current_syntax = "lua"
 
diff --git a/runtime/syntax/m4.vim b/runtime/syntax/m4.vim
--- a/runtime/syntax/m4.vim
+++ b/runtime/syntax/m4.vim
@@ -37,21 +37,19 @@ syn cluster m4Top     contains=m4Comment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink m4Delimiter Delimiter
-HiLink m4Comment   Comment
-HiLink m4Function  Function
-HiLink m4Keyword   Keyword
-HiLink m4Special   Special
-HiLink m4String    String
-HiLink m4Statement Statement
-HiLink m4Preproc   PreProc
-HiLink m4Type      Type
-HiLink m4Special   Special
-HiLink m4Variable  Special
-HiLink m4Constants Constant
-HiLink m4Builtin   Statement
-delcommand HiLink
+hi def link m4Delimiter Delimiter
+hi def link m4Comment   Comment
+hi def link m4Function  Function
+hi def link m4Keyword   Keyword
+hi def link m4Special   Special
+hi def link m4String    String
+hi def link m4Statement Statement
+hi def link m4Preproc   PreProc
+hi def link m4Type      Type
+hi def link m4Special   Special
+hi def link m4Variable  Special
+hi def link m4Constants Constant
+hi def link m4Builtin   Statement
 
 let b:current_syntax = "m4"
 
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -99,31 +99,29 @@ syn sync match makeCommandSync groupther
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink makeNextLine		makeSpecial
-HiLink makeCmdNextLine	makeSpecial
-HiLink makeSpecTarget		Statement
+hi def link makeNextLine		makeSpecial
+hi def link makeCmdNextLine	makeSpecial
+hi def link makeSpecTarget		Statement
 if !exists("make_no_commands")
-HiLink makeCommands		Number
+hi def link makeCommands		Number
 endif
-HiLink makeImplicit		Function
-HiLink makeTarget		Function
-HiLink makeInclude		Include
-HiLink makePreCondit		PreCondit
-HiLink makeStatement		Statement
-HiLink makeIdent		Identifier
-HiLink makeSpecial		Special
-HiLink makeComment		Comment
-HiLink makeDString		String
-HiLink makeSString		String
-HiLink makeBString		Function
-HiLink makeError		Error
-HiLink makeTodo		Todo
-HiLink makeDefine		Define
-HiLink makeCommandError	Error
-HiLink makeConfig		PreCondit
-delcommand HiLink
+hi def link makeImplicit		Function
+hi def link makeTarget		Function
+hi def link makeInclude		Include
+hi def link makePreCondit		PreCondit
+hi def link makeStatement		Statement
+hi def link makeIdent		Identifier
+hi def link makeSpecial		Special
+hi def link makeComment		Comment
+hi def link makeDString		String
+hi def link makeSString		String
+hi def link makeBString		Function
+hi def link makeError		Error
+hi def link makeTodo		Todo
+hi def link makeDefine		Define
+hi def link makeCommandError	Error
+hi def link makeConfig		PreCondit
 
 let b:current_syntax = "make"
 
diff --git a/runtime/syntax/man.vim b/runtime/syntax/man.vim
--- a/runtime/syntax/man.vim
+++ b/runtime/syntax/man.vim
@@ -35,17 +35,15 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink manTitle	    Title
-HiLink manSectionHeading  Statement
-HiLink manOptionDesc	    Constant
-HiLink manLongOptionDesc  Constant
-HiLink manReference	    PreProc
-HiLink manSubHeading      Function
-HiLink manCFuncDefinition Function
+hi def link manTitle	    Title
+hi def link manSectionHeading  Statement
+hi def link manOptionDesc	    Constant
+hi def link manLongOptionDesc  Constant
+hi def link manReference	    PreProc
+hi def link manSubHeading      Function
+hi def link manCFuncDefinition Function
 
-delcommand HiLink
 
 let b:current_syntax = "man"
 
diff --git a/runtime/syntax/maple.vim b/runtime/syntax/maple.vim
--- a/runtime/syntax/maple.vim
+++ b/runtime/syntax/maple.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Maple V (based on release 4)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	13
+" Last Change:	Aug 31, 2016
+" Version:	15
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
 "
 " Package Function Selection: {{{1
@@ -549,73 +549,73 @@ endif
 
 " Highlighting: Define the default highlighting. {{{1
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_maplev_syntax_inits")
 
-" Maple->Maple Links {{{2
-HiLink mvBraceError	mvError
-HiLink mvCurlyError	mvError
-HiLink mvDebug		mvTodo
-HiLink mvParenError	mvError
-HiLink mvPkg_DEtools	mvPkgFunc
-HiLink mvPkg_Galois	mvPkgFunc
-HiLink mvPkg_GaussInt	mvPkgFunc
-HiLink mvPkg_LREtools	mvPkgFunc
-HiLink mvPkg_combinat	mvPkgFunc
-HiLink mvPkg_combstruct	mvPkgFunc
-HiLink mvPkg_difforms	mvPkgFunc
-HiLink mvPkg_finance	mvPkgFunc
-HiLink mvPkg_genfunc	mvPkgFunc
-HiLink mvPkg_geometry	mvPkgFunc
-HiLink mvPkg_grobner	mvPkgFunc
-HiLink mvPkg_group	mvPkgFunc
-HiLink mvPkg_inttrans	mvPkgFunc
-HiLink mvPkg_liesymm	mvPkgFunc
-HiLink mvPkg_linalg	mvPkgFunc
-HiLink mvPkg_logic	mvPkgFunc
-HiLink mvPkg_networks	mvPkgFunc
-HiLink mvPkg_numapprox	mvPkgFunc
-HiLink mvPkg_numtheory	mvPkgFunc
-HiLink mvPkg_orthopoly	mvPkgFunc
-HiLink mvPkg_padic	mvPkgFunc
-HiLink mvPkg_plots	mvPkgFunc
-HiLink mvPkg_plottools	mvPkgFunc
-HiLink mvPkg_powseries	mvPkgFunc
-HiLink mvPkg_process	mvPkgFunc
-HiLink mvPkg_simplex	mvPkgFunc
-HiLink mvPkg_stats	mvPkgFunc
-HiLink mvPkg_student	mvPkgFunc
-HiLink mvPkg_sumtools	mvPkgFunc
-HiLink mvPkg_tensor	mvPkgFunc
-HiLink mvPkg_totorder	mvPkgFunc
-HiLink mvRange		mvOper
-HiLink mvSemiError	mvError
-HiLink mvDelim		Delimiter
+  " Maple->Maple Links {{{2
+  hi def link mvBraceError	mvError
+  hi def link mvCurlyError	mvError
+  hi def link mvDebug		mvTodo
+  hi def link mvParenError	mvError
+  hi def link mvPkg_DEtools	mvPkgFunc
+  hi def link mvPkg_Galois	mvPkgFunc
+  hi def link mvPkg_GaussInt	mvPkgFunc
+  hi def link mvPkg_LREtools	mvPkgFunc
+  hi def link mvPkg_combinat	mvPkgFunc
+  hi def link mvPkg_combstruct	mvPkgFunc
+  hi def link mvPkg_difforms	mvPkgFunc
+  hi def link mvPkg_finance	mvPkgFunc
+  hi def link mvPkg_genfunc	mvPkgFunc
+  hi def link mvPkg_geometry	mvPkgFunc
+  hi def link mvPkg_grobner	mvPkgFunc
+  hi def link mvPkg_group	mvPkgFunc
+  hi def link mvPkg_inttrans	mvPkgFunc
+  hi def link mvPkg_liesymm	mvPkgFunc
+  hi def link mvPkg_linalg	mvPkgFunc
+  hi def link mvPkg_logic	mvPkgFunc
+  hi def link mvPkg_networks	mvPkgFunc
+  hi def link mvPkg_numapprox	mvPkgFunc
+  hi def link mvPkg_numtheory	mvPkgFunc
+  hi def link mvPkg_orthopoly	mvPkgFunc
+  hi def link mvPkg_padic	mvPkgFunc
+  hi def link mvPkg_plots	mvPkgFunc
+  hi def link mvPkg_plottools	mvPkgFunc
+  hi def link mvPkg_powseries	mvPkgFunc
+  hi def link mvPkg_process	mvPkgFunc
+  hi def link mvPkg_simplex	mvPkgFunc
+  hi def link mvPkg_stats	mvPkgFunc
+  hi def link mvPkg_student	mvPkgFunc
+  hi def link mvPkg_sumtools	mvPkgFunc
+  hi def link mvPkg_tensor	mvPkgFunc
+  hi def link mvPkg_totorder	mvPkgFunc
+  hi def link mvRange		mvOper
+  hi def link mvSemiError	mvError
+  hi def link mvDelim		Delimiter
 
-" Maple->Standard Links {{{2
-HiLink mvAssign		Delimiter
-HiLink mvBool		Boolean
-HiLink mvComma		Delimiter
-HiLink mvComment		Comment
-HiLink mvCond		Conditional
-HiLink mvConstant		Number
-HiLink mvDelayEval	Label
-HiLink mvDcolon		Delimiter
-HiLink mvError		Error
-HiLink mvLibrary		Statement
-HiLink mvNumber		Number
-HiLink mvOper		Operator
-HiLink mvAssign		Delimiter
-HiLink mvPackage		Type
-HiLink mvPkgFunc		Function
-HiLink mvPktOption	Special
-HiLink mvRepeat		Repeat
-HiLink mvSpecial		Special
-HiLink mvStatement	Statement
-HiLink mvName		String
-HiLink mvString		String
-HiLink mvTodo		Todo
+  " Maple->Standard Links {{{2
+  hi def link mvAssign		Delimiter
+  hi def link mvBool		Boolean
+  hi def link mvComma		Delimiter
+  hi def link mvComment		Comment
+  hi def link mvCond		Conditional
+  hi def link mvConstant		Number
+  hi def link mvDelayEval	Label
+  hi def link mvDcolon		Delimiter
+  hi def link mvError		Error
+  hi def link mvLibrary		Statement
+  hi def link mvNumber		Number
+  hi def link mvOper		Operator
+  hi def link mvAssign		Delimiter
+  hi def link mvPackage		Type
+  hi def link mvPkgFunc		Function
+  hi def link mvPktOption	Special
+  hi def link mvRepeat		Repeat
+  hi def link mvSpecial		Special
+  hi def link mvStatement	Statement
+  hi def link mvName		String
+  hi def link mvString		String
+  hi def link mvTodo		Todo
 
-delcommand HiLink
+endif
 
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
diff --git a/runtime/syntax/master.vim b/runtime/syntax/master.vim
--- a/runtime/syntax/master.vim
+++ b/runtime/syntax/master.vim
@@ -26,13 +26,11 @@ syn match   masterComment	"\$.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink masterKeyword Keyword
-HiLink masterComment Comment
-HiLink masterString  String
+hi def link masterKeyword Keyword
+hi def link masterComment Comment
+hi def link masterString  String
 
-delcommand HiLink
 
 let b:current_syntax = "master"
 
diff --git a/runtime/syntax/matlab.vim b/runtime/syntax/matlab.vim
--- a/runtime/syntax/matlab.vim
+++ b/runtime/syntax/matlab.vim
@@ -74,40 +74,38 @@ syn match matlabError	"-\=\<\d\+\.\d\+[e
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink matlabTransposeOperator	matlabOperator
-HiLink matlabOperator			Operator
-HiLink matlabLineContinuation		Special
-HiLink matlabLabel			Label
-HiLink matlabConditional		Conditional
-HiLink matlabExceptions		Conditional
-HiLink matlabRepeat			Repeat
-HiLink matlabTodo			Todo
-HiLink matlabString			String
-HiLink matlabDelimiter		Identifier
-HiLink matlabTransposeOther		Identifier
-HiLink matlabNumber			Number
-HiLink matlabFloat			Float
-HiLink matlabFunction			Function
-HiLink matlabError			Error
-HiLink matlabImplicit			matlabStatement
-HiLink matlabStatement		Statement
-HiLink matlabOO			Statement
-HiLink matlabSemicolon		SpecialChar
-HiLink matlabComment			Comment
-HiLink matlabMultilineComment		Comment
-HiLink matlabScope			Type
+hi def link matlabTransposeOperator	matlabOperator
+hi def link matlabOperator			Operator
+hi def link matlabLineContinuation		Special
+hi def link matlabLabel			Label
+hi def link matlabConditional		Conditional
+hi def link matlabExceptions		Conditional
+hi def link matlabRepeat			Repeat
+hi def link matlabTodo			Todo
+hi def link matlabString			String
+hi def link matlabDelimiter		Identifier
+hi def link matlabTransposeOther		Identifier
+hi def link matlabNumber			Number
+hi def link matlabFloat			Float
+hi def link matlabFunction			Function
+hi def link matlabError			Error
+hi def link matlabImplicit			matlabStatement
+hi def link matlabStatement		Statement
+hi def link matlabOO			Statement
+hi def link matlabSemicolon		SpecialChar
+hi def link matlabComment			Comment
+hi def link matlabMultilineComment		Comment
+hi def link matlabScope			Type
 
-HiLink matlabArithmeticOperator	matlabOperator
-HiLink matlabRelationalOperator	matlabOperator
-HiLink matlabLogicalOperator		matlabOperator
+hi def link matlabArithmeticOperator	matlabOperator
+hi def link matlabRelationalOperator	matlabOperator
+hi def link matlabLogicalOperator		matlabOperator
 
 "optional highlighting
-"HiLink matlabIdentifier		Identifier
-"HiLink matlabTab			Error
+"hi def link matlabIdentifier		Identifier
+"hi def link matlabTab			Error
 
-delcommand HiLink
 
 let b:current_syntax = "matlab"
 
diff --git a/runtime/syntax/maxima.vim b/runtime/syntax/maxima.vim
--- a/runtime/syntax/maxima.vim
+++ b/runtime/syntax/maxima.vim
@@ -232,32 +232,30 @@ syn sync match maximaSyncComment	groupth
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink maximaBraceError	maximaError
-HiLink maximaCmd	maximaStatement
-HiLink maximaCurlyError	maximaError
-HiLink maximaFuncCmd	maximaStatement
-HiLink maximaParenError	maximaError
+hi def link maximaBraceError	maximaError
+hi def link maximaCmd	maximaStatement
+hi def link maximaCurlyError	maximaError
+hi def link maximaFuncCmd	maximaStatement
+hi def link maximaParenError	maximaError
 
 " The default methods for highlighting.  Can be overridden later
-HiLink maximaCharacter	Character
-HiLink maximaComma	Function
-HiLink maximaCommentBlock	Comment
-HiLink maximaConditional	Conditional
-HiLink maximaError	Error
-HiLink maximaFunc	Delimiter
-HiLink maximaOp                 Delimiter
-HiLink maximaLabel	PreProc
-HiLink maximaNumber	Number
-HiLink maximaFloat	Float
-HiLink maximaRepeat	Repeat
-HiLink maximaSpecial	Type
-HiLink maximaSpecialChar	SpecialChar
-HiLink maximaStatement	Statement
-HiLink maximaString	String
-HiLink maximaTodo	Todo
+hi def link maximaCharacter	Character
+hi def link maximaComma	Function
+hi def link maximaCommentBlock	Comment
+hi def link maximaConditional	Conditional
+hi def link maximaError	Error
+hi def link maximaFunc	Delimiter
+hi def link maximaOp                 Delimiter
+hi def link maximaLabel	PreProc
+hi def link maximaNumber	Number
+hi def link maximaFloat	Float
+hi def link maximaRepeat	Repeat
+hi def link maximaSpecial	Type
+hi def link maximaSpecialChar	SpecialChar
+hi def link maximaStatement	Statement
+hi def link maximaString	String
+hi def link maximaTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "maxima"
diff --git a/runtime/syntax/mel.vim b/runtime/syntax/mel.vim
--- a/runtime/syntax/mel.vim
+++ b/runtime/syntax/mel.vim
@@ -75,36 +75,34 @@ exec "sy sync ccomment melComment minlin
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink melBoolean	Boolean
-HiLink melFunction	Function
-HiLink melIdentifier	Identifier
-HiLink melStatement	Statement
-HiLink melConditional Conditional
-HiLink melRepeat	Repeat
-HiLink melLabel	Label
-HiLink melOperator	Operator
-HiLink melKeyword	Keyword
-HiLink melException	Exception
-HiLink melInclude	Include
-HiLink melType	Type
-HiLink melStorageClass StorageClass
-HiLink melDebug	Debug
-HiLink melTodo	Todo
-HiLink melCharSpecial SpecialChar
-HiLink melString	String
-HiLink melInteger	Number
-HiLink melFloat	Float
-HiLink melMatrixVector Float
-HiLink melComment	Comment
-HiLink melError	Error
-HiLink melSpaceError	melError
-HiLink melCharError	melError
-HiLink melParenError	melError
-HiLink melInParen	melError
-HiLink melCommentError melError
+hi def link melBoolean	Boolean
+hi def link melFunction	Function
+hi def link melIdentifier	Identifier
+hi def link melStatement	Statement
+hi def link melConditional Conditional
+hi def link melRepeat	Repeat
+hi def link melLabel	Label
+hi def link melOperator	Operator
+hi def link melKeyword	Keyword
+hi def link melException	Exception
+hi def link melInclude	Include
+hi def link melType	Type
+hi def link melStorageClass StorageClass
+hi def link melDebug	Debug
+hi def link melTodo	Todo
+hi def link melCharSpecial SpecialChar
+hi def link melString	String
+hi def link melInteger	Number
+hi def link melFloat	Float
+hi def link melMatrixVector Float
+hi def link melComment	Comment
+hi def link melError	Error
+hi def link melSpaceError	melError
+hi def link melCharError	melError
+hi def link melParenError	melError
+hi def link melInParen	melError
+hi def link melCommentError melError
 
-delcommand HiLink
 
 let b:current_syntax = "mel"
diff --git a/runtime/syntax/mf.vim b/runtime/syntax/mf.vim
--- a/runtime/syntax/mf.vim
+++ b/runtime/syntax/mf.vim
@@ -155,31 +155,29 @@ syn sync maxlines=50
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mfBoolExp	Statement
-HiLink mfNumExp	Statement
-HiLink mfInternal	Identifier
-HiLink mfPairExp	Statement
-HiLink mfPathExp	Statement
-HiLink mfPenExp	Statement
-HiLink mfPicExp	Statement
-HiLink mfStringExp	Statement
-HiLink mfCommand	Statement
-HiLink mfType	Type
-HiLink mfStatement	Statement
-HiLink mfDefinition	Statement
-HiLink mfCondition	Conditional
-HiLink mfPrimitive	Statement
-HiLink mfMacro	Macro
-HiLink mfCoord	Identifier
-HiLink mfPoint	Identifier
-HiLink mfNumeric	Number
-HiLink mfLength	Number
-HiLink mfComment	Comment
-HiLink mfString	String
+hi def link mfBoolExp	Statement
+hi def link mfNumExp	Statement
+hi def link mfInternal	Identifier
+hi def link mfPairExp	Statement
+hi def link mfPathExp	Statement
+hi def link mfPenExp	Statement
+hi def link mfPicExp	Statement
+hi def link mfStringExp	Statement
+hi def link mfCommand	Statement
+hi def link mfType	Type
+hi def link mfStatement	Statement
+hi def link mfDefinition	Statement
+hi def link mfCondition	Conditional
+hi def link mfPrimitive	Statement
+hi def link mfMacro	Macro
+hi def link mfCoord	Identifier
+hi def link mfPoint	Identifier
+hi def link mfNumeric	Number
+hi def link mfLength	Number
+hi def link mfComment	Comment
+hi def link mfString	String
 
-delcommand HiLink
 
 let b:current_syntax = "mf"
 
diff --git a/runtime/syntax/mgl.vim b/runtime/syntax/mgl.vim
--- a/runtime/syntax/mgl.vim
+++ b/runtime/syntax/mgl.vim
@@ -84,34 +84,32 @@ syn keyword mglPredefined	exception
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mglBoolean		Boolean
-HiLink mglComment		Comment
-HiLink mglConditional		Conditional
-HiLink mglConstant		Constant
-HiLink mglException		Exception
-HiLink mglFunction		Function
-HiLink mglLabel		Label
-HiLink mglMatrixDelimiter	Identifier
-HiLink mglNumber		Number
-HiLink mglHexNumber		Number
-HiLink mglCharacter		Number
-HiLink mglIpAddr		Number
-HiLink mglOperator		Operator
-HiLink mglPredefined		mglFunction
-HiLink mglPreProc		PreProc
-HiLink mglRepeat		Repeat
-HiLink mglStatement		Statement
-HiLink mglString		String
-HiLink mglStringEscape	Special
-HiLink mglStringEscapeGPC	Special
-HiLink mglStringError		Error
-HiLink mglStruct		mglStatement
-HiLink mglSymbolOperator	mglOperator
-HiLink mglType		Type
+hi def link mglBoolean		Boolean
+hi def link mglComment		Comment
+hi def link mglConditional		Conditional
+hi def link mglConstant		Constant
+hi def link mglException		Exception
+hi def link mglFunction		Function
+hi def link mglLabel		Label
+hi def link mglMatrixDelimiter	Identifier
+hi def link mglNumber		Number
+hi def link mglHexNumber		Number
+hi def link mglCharacter		Number
+hi def link mglIpAddr		Number
+hi def link mglOperator		Operator
+hi def link mglPredefined		mglFunction
+hi def link mglPreProc		PreProc
+hi def link mglRepeat		Repeat
+hi def link mglStatement		Statement
+hi def link mglString		String
+hi def link mglStringEscape	Special
+hi def link mglStringEscapeGPC	Special
+hi def link mglStringError		Error
+hi def link mglStruct		mglStatement
+hi def link mglSymbolOperator	mglOperator
+hi def link mglType		Type
 
-delcommand HiLink
 
 
 let b:current_syntax = "mgl"
diff --git a/runtime/syntax/mgp.vim b/runtime/syntax/mgp.vim
--- a/runtime/syntax/mgp.vim
+++ b/runtime/syntax/mgp.vim
@@ -46,26 +46,24 @@ syn match mgpNoDefault +^%nodefault$+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mgpLineSkip	Special
+hi def link mgpLineSkip	Special
 
-HiLink mgpHash	mgpComment
-HiLink mgpPercent	mgpComment
-HiLink mgpComment	Comment
+hi def link mgpHash	mgpComment
+hi def link mgpPercent	mgpComment
+hi def link mgpComment	Comment
 
-HiLink mgpCommand	Identifier
+hi def link mgpCommand	Identifier
 
-HiLink mgpLine	Type
-
-HiLink mgpFile	String
-HiLink mgpSize	Number
-HiLink mgpValue	Number
+hi def link mgpLine	Type
 
-HiLink mgpPage	mgpDefine
-HiLink mgpNoDefault	mgpDefine
-HiLink mgpDefine	Define
+hi def link mgpFile	String
+hi def link mgpSize	Number
+hi def link mgpValue	Number
 
-delcommand HiLink
+hi def link mgpPage	mgpDefine
+hi def link mgpNoDefault	mgpDefine
+hi def link mgpDefine	Define
+
 
 let b:current_syntax = "mgp"
diff --git a/runtime/syntax/mma.vim b/runtime/syntax/mma.vim
--- a/runtime/syntax/mma.vim
+++ b/runtime/syntax/mma.vim
@@ -282,7 +282,6 @@ syntax sync fromstart
 "set foldnestmax=1
 "set foldminlines=15
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE - the following links are not guaranteed to
 " look good under all colorschemes.  You might need to
@@ -290,32 +289,31 @@ command -nargs=+ HiLink hi def link <arg
 " look good in yours
 
 
-HiLink mmaComment           Comment
-HiLink mmaCommentStar       Comment
-HiLink mmaFunctionComment   Comment
-HiLink mmaLooseQuote        Comment
-HiLink mmaGenericFunction   Function
-HiLink mmaVariable          Identifier
-"    HiLink mmaSymbol            Identifier
-HiLink mmaOperator          Operator
-HiLink mmaPatternOp         Operator
-HiLink mmaPureFunction      Operator
-HiLink mmaString            String
-HiLink mmaCommentString     String
-HiLink mmaUnicode           String
-HiLink mmaMessage           Type
-HiLink mmaNumber            Type
-HiLink mmaPattern           Type
-HiLink mmaError             Error
-HiLink mmaFixme             Error
-HiLink mmaPatternError      Error
-HiLink mmaTodo              Todo
-HiLink mmaemPHAsis          Special
-HiLink mmaFunctionTitle     Special
-HiLink mmaMessageType       Special
-HiLink mmaItem              Preproc
+hi def link mmaComment           Comment
+hi def link mmaCommentStar       Comment
+hi def link mmaFunctionComment   Comment
+hi def link mmaLooseQuote        Comment
+hi def link mmaGenericFunction   Function
+hi def link mmaVariable          Identifier
+"    hi def link mmaSymbol            Identifier
+hi def link mmaOperator          Operator
+hi def link mmaPatternOp         Operator
+hi def link mmaPureFunction      Operator
+hi def link mmaString            String
+hi def link mmaCommentString     String
+hi def link mmaUnicode           String
+hi def link mmaMessage           Type
+hi def link mmaNumber            Type
+hi def link mmaPattern           Type
+hi def link mmaError             Error
+hi def link mmaFixme             Error
+hi def link mmaPatternError      Error
+hi def link mmaTodo              Todo
+hi def link mmaemPHAsis          Special
+hi def link mmaFunctionTitle     Special
+hi def link mmaMessageType       Special
+hi def link mmaItem              Preproc
 
-delcommand HiLink
 
 let b:current_syntax = "mma"
 
diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim
--- a/runtime/syntax/mmix.vim
+++ b/runtime/syntax/mmix.vim
@@ -119,35 +119,33 @@ syn keyword mmixRegister	rBB rTT rWW rXX
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mmixAt		Type
-HiLink mmixPseudo	Type
-HiLink mmixRegister	Special
-HiLink mmixSegments	Type
+hi def link mmixAt		Type
+hi def link mmixPseudo	Type
+hi def link mmixRegister	Special
+hi def link mmixSegments	Type
 
-HiLink mmixLabel	Special
-HiLink mmixComment	Comment
-HiLink mmixOpcode	Keyword
+hi def link mmixLabel	Special
+hi def link mmixComment	Comment
+hi def link mmixOpcode	Keyword
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
 
-HiLink mmixString	String
-HiLink mmixChar	String
+hi def link mmixString	String
+hi def link mmixChar	String
 
-HiLink mmixType	Type
-HiLink mmixIdentifier	Normal
-HiLink mmixSpecialComment Comment
+hi def link mmixType	Type
+hi def link mmixIdentifier	Normal
+hi def link mmixSpecialComment Comment
 
 " My default color overrides:
 " hi mmixSpecialComment ctermfg=red
 "hi mmixLabel ctermfg=lightcyan
 " hi mmixType ctermbg=black ctermfg=brown
 
-delcommand HiLink
 
 let b:current_syntax = "mmix"
 
diff --git a/runtime/syntax/modsim3.vim b/runtime/syntax/modsim3.vim
--- a/runtime/syntax/modsim3.vim
+++ b/runtime/syntax/modsim3.vim
@@ -76,22 +76,20 @@ syn match modsim3Literal "'[^']'\|''''"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modsim3Keyword	Statement
-HiLink modsim3Block		Statement
-HiLink modsim3Comment1	Comment
-HiLink modsim3Comment2	Comment
-HiLink modsim3String		String
-HiLink modsim3Literal	Character
-HiLink modsim3Include	Statement
-HiLink modsim3Type		Type
-HiLink modsim3ParenError	Error
-HiLink modsim3Builtin	Function
-HiLink modsim3BuiltinNoParen	Function
+hi def link modsim3Keyword	Statement
+hi def link modsim3Block		Statement
+hi def link modsim3Comment1	Comment
+hi def link modsim3Comment2	Comment
+hi def link modsim3String		String
+hi def link modsim3Literal	Character
+hi def link modsim3Include	Statement
+hi def link modsim3Type		Type
+hi def link modsim3ParenError	Error
+hi def link modsim3Builtin	Function
+hi def link modsim3BuiltinNoParen	Function
 
-delcommand HiLink
 
 let b:current_syntax = "modsim3"
 
diff --git a/runtime/syntax/modula2.vim b/runtime/syntax/modula2.vim
--- a/runtime/syntax/modula2.vim
+++ b/runtime/syntax/modula2.vim
@@ -52,23 +52,21 @@ syn region modula2Set start="{" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink modula2Ident		Identifier
-HiLink modula2StdConst	Boolean
-HiLink modula2Type		Identifier
-HiLink modula2StdFunc		Identifier
-HiLink modula2Header		Type
-HiLink modula2Keyword		Statement
-HiLink modula2AttKeyword	PreProc
-HiLink modula2Comment		Comment
+hi def link modula2Ident		Identifier
+hi def link modula2StdConst	Boolean
+hi def link modula2Type		Identifier
+hi def link modula2StdFunc		Identifier
+hi def link modula2Header		Type
+hi def link modula2Keyword		Statement
+hi def link modula2AttKeyword	PreProc
+hi def link modula2Comment		Comment
 " The following is just a matter of taste (you want to try this instead):
 " hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
-HiLink modula2Todo		Todo
-HiLink modula2String		String
-HiLink modula2Set		String
+hi def link modula2Todo		Todo
+hi def link modula2String		String
+hi def link modula2Set		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula2"
 
diff --git a/runtime/syntax/modula3.vim b/runtime/syntax/modula3.vim
--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@@ -44,15 +44,13 @@ syn region modula3String start=+'+ end=+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modula3Keyword	Statement
-HiLink modula3Block		PreProc
-HiLink modula3Comment	Comment
-HiLink modula3String		String
+hi def link modula3Keyword	Statement
+hi def link modula3Block		PreProc
+hi def link modula3Comment	Comment
+hi def link modula3String		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula3"
 
diff --git a/runtime/syntax/monk.vim b/runtime/syntax/monk.vim
--- a/runtime/syntax/monk.vim
+++ b/runtime/syntax/monk.vim
@@ -195,23 +195,21 @@ syn sync match matchPlace grouphere NONE
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink monkSyntax		Statement
-HiLink monkFunc		Function
+hi def link monkSyntax		Statement
+hi def link monkFunc		Function
 
-HiLink monkString		String
-HiLink monkChar		Character
-HiLink monkNumber		Number
-HiLink monkBoolean		Boolean
+hi def link monkString		String
+hi def link monkChar		Character
+hi def link monkNumber		Number
+hi def link monkBoolean		Boolean
 
-HiLink monkDelimiter	Delimiter
-HiLink monkConstant	Constant
+hi def link monkDelimiter	Delimiter
+hi def link monkConstant	Constant
 
-HiLink monkComment		Comment
-HiLink monkError		Error
+hi def link monkComment		Comment
+hi def link monkError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "monk"
 
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -102,15 +102,13 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mpTeXinsert	String
-HiLink mpTeXbegin	Statement
-HiLink mpTeXend	Statement
-HiLink mpInternal	mfInternal
-HiLink mpMacro	Macro
+hi def link mpTeXinsert	String
+hi def link mpTeXbegin	Statement
+hi def link mpTeXend	Statement
+hi def link mpInternal	mfInternal
+hi def link mpMacro	Macro
 
-delcommand HiLink
 
 let b:current_syntax = "mp"
 
diff --git a/runtime/syntax/msidl.vim b/runtime/syntax/msidl.vim
--- a/runtime/syntax/msidl.vim
+++ b/runtime/syntax/msidl.vim
@@ -54,30 +54,28 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink msidlInclude		Include
-HiLink msidlPreProc		PreProc
-HiLink msidlPreCondit		PreCondit
-HiLink msidlDefine		Macro
-HiLink msidlIncluded		String
-HiLink msidlString		String
-HiLink msidlComment		Comment
-HiLink msidlTodo		Todo
-HiLink msidlSpecial		SpecialChar
-HiLink msidlLiteral		Number
-HiLink msidlUUID		Number
+hi def link msidlInclude		Include
+hi def link msidlPreProc		PreProc
+hi def link msidlPreCondit		PreCondit
+hi def link msidlDefine		Macro
+hi def link msidlIncluded		String
+hi def link msidlString		String
+hi def link msidlComment		Comment
+hi def link msidlTodo		Todo
+hi def link msidlSpecial		SpecialChar
+hi def link msidlLiteral		Number
+hi def link msidlUUID		Number
 
-HiLink msidlImport		Include
-HiLink msidlEnum		StorageClass
-HiLink msidlStruct		Structure
-HiLink msidlTypedef		Typedef
-HiLink msidlAttribute		StorageClass
+hi def link msidlImport		Include
+hi def link msidlEnum		StorageClass
+hi def link msidlStruct		Structure
+hi def link msidlTypedef		Typedef
+hi def link msidlAttribute		StorageClass
 
-HiLink msidlStandardType	Type
-HiLink msidlSafeArray		Type
+hi def link msidlStandardType	Type
+hi def link msidlSafeArray		Type
 
-delcommand HiLink
 
 let b:current_syntax = "msidl"
 
diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim
--- a/runtime/syntax/msql.vim
+++ b/runtime/syntax/msql.vim
@@ -51,30 +51,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink msqlComment		Comment
-HiLink msqlString		String
-HiLink msqlNumber		Number
-HiLink msqlFloat		Float
-HiLink msqlIdentifier	Identifier
-HiLink msqlGlobalIdentifier	Identifier
-HiLink msqlIntVar		Identifier
-HiLink msqlEnvVar		Identifier
-HiLink msqlFunctions		Function
-HiLink msqlRepeat		Repeat
-HiLink msqlConditional	Conditional
-HiLink msqlStatement		Statement
-HiLink msqlType		Type
-HiLink msqlInclude		Include
-HiLink msqlDefine		Define
-HiLink msqlSpecialChar	SpecialChar
-HiLink msqlParentError	Error
-HiLink msqlTodo		Todo
-HiLink msqlOperator		Operator
-HiLink msqlRelation		Operator
+hi def link msqlComment		Comment
+hi def link msqlString		String
+hi def link msqlNumber		Number
+hi def link msqlFloat		Float
+hi def link msqlIdentifier	Identifier
+hi def link msqlGlobalIdentifier	Identifier
+hi def link msqlIntVar		Identifier
+hi def link msqlEnvVar		Identifier
+hi def link msqlFunctions		Function
+hi def link msqlRepeat		Repeat
+hi def link msqlConditional	Conditional
+hi def link msqlStatement		Statement
+hi def link msqlType		Type
+hi def link msqlInclude		Include
+hi def link msqlDefine		Define
+hi def link msqlSpecialChar	SpecialChar
+hi def link msqlParentError	Error
+hi def link msqlTodo		Todo
+hi def link msqlOperator		Operator
+hi def link msqlRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "msql"
 
diff --git a/runtime/syntax/mupad.vim b/runtime/syntax/mupad.vim
--- a/runtime/syntax/mupad.vim
+++ b/runtime/syntax/mupad.vim
@@ -265,21 +265,19 @@ syn keyword mupadIdentifier	Tubular
 " graphics  meta-documentation Attributes
 syn keyword mupadIdentifier	objectGroupsListed
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mupadComment		Comment
-HiLink mupadString		String
-HiLink mupadOperator		Operator
-HiLink mupadSpecial		Special
-HiLink mupadStatement		Statement
-HiLink mupadUnderlined	Underlined
-HiLink mupadConditional	Conditional
-HiLink mupadRepeat		Repeat
-HiLink mupadFunction		Function
-HiLink mupadType		Type
-HiLink mupadDefine		Define
-HiLink mupadIdentifier	Identifier
+hi def link mupadComment		Comment
+hi def link mupadString		String
+hi def link mupadOperator		Operator
+hi def link mupadSpecial		Special
+hi def link mupadStatement		Statement
+hi def link mupadUnderlined	Underlined
+hi def link mupadConditional	Conditional
+hi def link mupadRepeat		Repeat
+hi def link mupadFunction		Function
+hi def link mupadType		Type
+hi def link mupadDefine		Define
+hi def link mupadIdentifier	Identifier
 
-delcommand HiLink
 
 " TODO  More comprehensive listing.
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -182,35 +182,33 @@ syntax keyword mushAttribute use va vb v
 syntax keyword mushAttribute vo vp vq vr vs vt vu vv vw vx vy vz
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mushAttribute  Constant
-HiLink mushCommand    Function
-HiLink mushNumber     Number
-HiLink mushSetting    PreProc
-HiLink mushFunction   Statement
-HiLink mushVariable   Identifier
-HiLink mushSpecial    Special
-HiLink mushTodo       Todo
-HiLink mushFlag       Special
-HiLink mushIdentifier Identifier
-HiLink mushDefine     Macro
-HiLink mushPreProc    PreProc
-HiLink mushPreProcGroup PreProc 
-HiLink mushPreCondit PreCondit
-HiLink mushIncluded cString
-HiLink  mushInclude Include
+hi def link mushAttribute  Constant
+hi def link mushCommand    Function
+hi def link mushNumber     Number
+hi def link mushSetting    PreProc
+hi def link mushFunction   Statement
+hi def link mushVariable   Identifier
+hi def link mushSpecial    Special
+hi def link mushTodo       Todo
+hi def link mushFlag       Special
+hi def link mushIdentifier Identifier
+hi def link mushDefine     Macro
+hi def link mushPreProc    PreProc
+hi def link mushPreProcGroup PreProc 
+hi def link mushPreCondit PreCondit
+hi def link mushIncluded cString
+hi def link mushInclude Include
 
 
 
 " Comments
-HiLink mushCommentStart mushComment
-HiLink mushComment    Comment
-HiLink mushCommentString mushString
+hi def link mushCommentStart mushComment
+hi def link mushComment    Comment
+hi def link mushCommentString mushString
 
 
-delcommand HiLink
 
 let b:current_syntax = "mush"
 
diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -630,151 +630,149 @@ syn match   muttrcMonoLine	"^\s*mono\s\+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink muttrcComment		Comment
-HiLink muttrcEscape		SpecialChar
-HiLink muttrcRXChars		SpecialChar
-HiLink muttrcString		String
-HiLink muttrcRXString		String
-HiLink muttrcRXString2	String
-HiLink muttrcSpecial		Special
-HiLink muttrcHooks		Type
-HiLink muttrcGroupFlag	Type
-HiLink muttrcGroupDef		Macro
-HiLink muttrcAddrDef		muttrcGroupFlag
-HiLink muttrcRXDef		muttrcGroupFlag
-HiLink muttrcRXPat		String
-HiLink muttrcAliasGroupName	Macro
-HiLink muttrcAliasKey	        Identifier
-HiLink muttrcUnAliasKey	Identifier
-HiLink muttrcAliasEncEmail	Identifier
-HiLink muttrcAliasParens	Type
-HiLink muttrcSetNumAssignment	Number
-HiLink muttrcSetBoolAssignment	Boolean
-HiLink muttrcSetQuadAssignment	Boolean
-HiLink muttrcSetStrAssignment	String
-HiLink muttrcEmail		Special
-HiLink muttrcVariableInner	Special
-HiLink muttrcEscapedVariable	String
-HiLink muttrcHeader		Type
-HiLink muttrcKeySpecial	SpecialChar
-HiLink muttrcKey		Type
-HiLink muttrcKeyName		SpecialChar
-HiLink muttrcVarBool		Identifier
-HiLink muttrcVarQuad		Identifier
-HiLink muttrcVarNum		Identifier
-HiLink muttrcVarStr		Identifier
-HiLink muttrcMenu		Identifier
-HiLink muttrcCommand		Keyword
-HiLink muttrcMacroDescr	String
-HiLink muttrcAction		Macro
-HiLink muttrcBadAction	Error
-HiLink muttrcBindFunction	Error
-HiLink muttrcBindMenuList	Error
-HiLink muttrcFunction		Macro
-HiLink muttrcGroupKeyword	muttrcCommand
-HiLink muttrcGroupLine	Error
-HiLink muttrcSubscribeKeyword	muttrcCommand
-HiLink muttrcSubscribeLine	Error
-HiLink muttrcListsKeyword	muttrcCommand
-HiLink muttrcListsLine	Error
-HiLink muttrcAlternateKeyword	muttrcCommand
-HiLink muttrcAlternatesLine	Error
-HiLink muttrcAttachmentsLine	muttrcCommand
-HiLink muttrcAttachmentsFlag	Type
-HiLink muttrcAttachmentsMimeType	String
-HiLink muttrcColorLine	Error
-HiLink muttrcColorContext	Error
-HiLink muttrcColorContextI	Identifier
-HiLink muttrcColorContextH	Identifier
-HiLink muttrcColorKeyword	muttrcCommand
-HiLink muttrcColorKeywordI	muttrcColorKeyword
-HiLink muttrcColorKeywordH	muttrcColorKeyword
-HiLink muttrcColorField	Identifier
-HiLink muttrcColor		Type
-HiLink muttrcColorFG		Error
-HiLink muttrcColorFGI		Error
-HiLink muttrcColorFGH		Error
-HiLink muttrcColorBG		Error
-HiLink muttrcColorBGI		Error
-HiLink muttrcColorBGH		Error
-HiLink muttrcMonoAttrib	muttrcColor
-HiLink muttrcMono		muttrcCommand
-HiLink muttrcSimplePat	Identifier
-HiLink muttrcSimplePatString	Macro
-HiLink muttrcSimplePatMetas	Special
-HiLink muttrcPattern		Error
-HiLink muttrcUnColorLine	Error
-HiLink muttrcUnColorKeyword	muttrcCommand
-HiLink muttrcUnColorIndex	Identifier
-HiLink muttrcShellString	muttrcEscape
-HiLink muttrcRXHooks		muttrcCommand
-HiLink muttrcRXHookNot	Type
-HiLink muttrcPatHooks		muttrcCommand
-HiLink muttrcPatHookNot	Type
-HiLink muttrcFormatConditionals2 Type
-HiLink muttrcIndexFormatStr	muttrcString
-HiLink muttrcIndexFormatEscapes muttrcEscape
-HiLink muttrcIndexFormatConditionals muttrcFormatConditionals2
-HiLink muttrcAliasFormatStr	muttrcString
-HiLink muttrcAliasFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatStr	muttrcString
-HiLink muttrcAttachFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatConditionals muttrcFormatConditionals2
-HiLink muttrcComposeFormatStr	muttrcString
-HiLink muttrcComposeFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatStr	muttrcString
-HiLink muttrcFolderFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatConditionals muttrcFormatConditionals2
-HiLink muttrcMixFormatStr	muttrcString
-HiLink muttrcMixFormatEscapes muttrcEscape
-HiLink muttrcMixFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPFormatStr	muttrcString
-HiLink muttrcPGPFormatEscapes muttrcEscape
-HiLink muttrcPGPFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPCmdFormatStr	muttrcString
-HiLink muttrcPGPCmdFormatEscapes muttrcEscape
-HiLink muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
-HiLink muttrcStatusFormatStr	muttrcString
-HiLink muttrcStatusFormatEscapes muttrcEscape
-HiLink muttrcStatusFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPGetKeysFormatStr	muttrcString
-HiLink muttrcPGPGetKeysFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatStr	muttrcString
-HiLink muttrcSmimeFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatConditionals muttrcFormatConditionals2
-HiLink muttrcTimeEscapes	muttrcEscape
-HiLink muttrcPGPTimeEscapes	muttrcEscape
-HiLink muttrcStrftimeEscapes	Type
-HiLink muttrcStrftimeFormatStr muttrcString
-HiLink muttrcFormatErrors Error
+hi def link muttrcComment		Comment
+hi def link muttrcEscape		SpecialChar
+hi def link muttrcRXChars		SpecialChar
+hi def link muttrcString		String
+hi def link muttrcRXString		String
+hi def link muttrcRXString2	String
+hi def link muttrcSpecial		Special
+hi def link muttrcHooks		Type
+hi def link muttrcGroupFlag	Type
+hi def link muttrcGroupDef		Macro
+hi def link muttrcAddrDef		muttrcGroupFlag
+hi def link muttrcRXDef		muttrcGroupFlag
+hi def link muttrcRXPat		String
+hi def link muttrcAliasGroupName	Macro
+hi def link muttrcAliasKey	        Identifier
+hi def link muttrcUnAliasKey	Identifier
+hi def link muttrcAliasEncEmail	Identifier
+hi def link muttrcAliasParens	Type
+hi def link muttrcSetNumAssignment	Number
+hi def link muttrcSetBoolAssignment	Boolean
+hi def link muttrcSetQuadAssignment	Boolean
+hi def link muttrcSetStrAssignment	String
+hi def link muttrcEmail		Special
+hi def link muttrcVariableInner	Special
+hi def link muttrcEscapedVariable	String
+hi def link muttrcHeader		Type
+hi def link muttrcKeySpecial	SpecialChar
+hi def link muttrcKey		Type
+hi def link muttrcKeyName		SpecialChar
+hi def link muttrcVarBool		Identifier
+hi def link muttrcVarQuad		Identifier
+hi def link muttrcVarNum		Identifier
+hi def link muttrcVarStr		Identifier
+hi def link muttrcMenu		Identifier
+hi def link muttrcCommand		Keyword
+hi def link muttrcMacroDescr	String
+hi def link muttrcAction		Macro
+hi def link muttrcBadAction	Error
+hi def link muttrcBindFunction	Error
+hi def link muttrcBindMenuList	Error
+hi def link muttrcFunction		Macro
+hi def link muttrcGroupKeyword	muttrcCommand
+hi def link muttrcGroupLine	Error
+hi def link muttrcSubscribeKeyword	muttrcCommand
+hi def link muttrcSubscribeLine	Error
+hi def link muttrcListsKeyword	muttrcCommand
+hi def link muttrcListsLine	Error
+hi def link muttrcAlternateKeyword	muttrcCommand
+hi def link muttrcAlternatesLine	Error
+hi def link muttrcAttachmentsLine	muttrcCommand
+hi def link muttrcAttachmentsFlag	Type
+hi def link muttrcAttachmentsMimeType	String
+hi def link muttrcColorLine	Error
+hi def link muttrcColorContext	Error
+hi def link muttrcColorContextI	Identifier
+hi def link muttrcColorContextH	Identifier
+hi def link muttrcColorKeyword	muttrcCommand
+hi def link muttrcColorKeywordI	muttrcColorKeyword
+hi def link muttrcColorKeywordH	muttrcColorKeyword
+hi def link muttrcColorField	Identifier
+hi def link muttrcColor		Type
+hi def link muttrcColorFG		Error
+hi def link muttrcColorFGI		Error
+hi def link muttrcColorFGH		Error
+hi def link muttrcColorBG		Error
+hi def link muttrcColorBGI		Error
+hi def link muttrcColorBGH		Error
+hi def link muttrcMonoAttrib	muttrcColor
+hi def link muttrcMono		muttrcCommand
+hi def link muttrcSimplePat	Identifier
+hi def link muttrcSimplePatString	Macro
+hi def link muttrcSimplePatMetas	Special
+hi def link muttrcPattern		Error
+hi def link muttrcUnColorLine	Error
+hi def link muttrcUnColorKeyword	muttrcCommand
+hi def link muttrcUnColorIndex	Identifier
+hi def link muttrcShellString	muttrcEscape
+hi def link muttrcRXHooks		muttrcCommand
+hi def link muttrcRXHookNot	Type
+hi def link muttrcPatHooks		muttrcCommand
+hi def link muttrcPatHookNot	Type
+hi def link muttrcFormatConditionals2 Type
+hi def link muttrcIndexFormatStr	muttrcString
+hi def link muttrcIndexFormatEscapes muttrcEscape
+hi def link muttrcIndexFormatConditionals muttrcFormatConditionals2
+hi def link muttrcAliasFormatStr	muttrcString
+hi def link muttrcAliasFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatStr	muttrcString
+hi def link muttrcAttachFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatConditionals muttrcFormatConditionals2
+hi def link muttrcComposeFormatStr	muttrcString
+hi def link muttrcComposeFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatStr	muttrcString
+hi def link muttrcFolderFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatConditionals muttrcFormatConditionals2
+hi def link muttrcMixFormatStr	muttrcString
+hi def link muttrcMixFormatEscapes muttrcEscape
+hi def link muttrcMixFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPFormatStr	muttrcString
+hi def link muttrcPGPFormatEscapes muttrcEscape
+hi def link muttrcPGPFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPCmdFormatStr	muttrcString
+hi def link muttrcPGPCmdFormatEscapes muttrcEscape
+hi def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
+hi def link muttrcStatusFormatStr	muttrcString
+hi def link muttrcStatusFormatEscapes muttrcEscape
+hi def link muttrcStatusFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPGetKeysFormatStr	muttrcString
+hi def link muttrcPGPGetKeysFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatStr	muttrcString
+hi def link muttrcSmimeFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
+hi def link muttrcTimeEscapes	muttrcEscape
+hi def link muttrcPGPTimeEscapes	muttrcEscape
+hi def link muttrcStrftimeEscapes	Type
+hi def link muttrcStrftimeFormatStr muttrcString
+hi def link muttrcFormatErrors Error
 
-HiLink muttrcBindFunctionNL	SpecialChar
-HiLink muttrcBindKeyNL	SpecialChar
-HiLink muttrcBindMenuListNL	SpecialChar
-HiLink muttrcMacroDescrNL	SpecialChar
-HiLink muttrcMacroBodyNL	SpecialChar
-HiLink muttrcMacroKeyNL	SpecialChar
-HiLink muttrcMacroMenuListNL	SpecialChar
-HiLink muttrcColorMatchCountNL SpecialChar
-HiLink muttrcColorNL		SpecialChar
-HiLink muttrcColorRXNL	SpecialChar
-HiLink muttrcColorBGNL	SpecialChar
-HiLink muttrcColorFGNL	SpecialChar
-HiLink muttrcAliasNameNL	SpecialChar
-HiLink muttrcAliasENNL	SpecialChar
-HiLink muttrcAliasNL		SpecialChar
-HiLink muttrcUnAliasNL	SpecialChar
-HiLink muttrcAliasGroupDefNL	SpecialChar
-HiLink muttrcAliasEncEmailNL	SpecialChar
-HiLink muttrcPatternNL	SpecialChar
-HiLink muttrcUnColorPatNL	SpecialChar
-HiLink muttrcUnColorAPNL	SpecialChar
-HiLink muttrcUnColorIndexNL	SpecialChar
-HiLink muttrcStringNL		SpecialChar
+hi def link muttrcBindFunctionNL	SpecialChar
+hi def link muttrcBindKeyNL	SpecialChar
+hi def link muttrcBindMenuListNL	SpecialChar
+hi def link muttrcMacroDescrNL	SpecialChar
+hi def link muttrcMacroBodyNL	SpecialChar
+hi def link muttrcMacroKeyNL	SpecialChar
+hi def link muttrcMacroMenuListNL	SpecialChar
+hi def link muttrcColorMatchCountNL SpecialChar
+hi def link muttrcColorNL		SpecialChar
+hi def link muttrcColorRXNL	SpecialChar
+hi def link muttrcColorBGNL	SpecialChar
+hi def link muttrcColorFGNL	SpecialChar
+hi def link muttrcAliasNameNL	SpecialChar
+hi def link muttrcAliasENNL	SpecialChar
+hi def link muttrcAliasNL		SpecialChar
+hi def link muttrcUnAliasNL	SpecialChar
+hi def link muttrcAliasGroupDefNL	SpecialChar
+hi def link muttrcAliasEncEmailNL	SpecialChar
+hi def link muttrcPatternNL	SpecialChar
+hi def link muttrcUnColorPatNL	SpecialChar
+hi def link muttrcUnColorAPNL	SpecialChar
+hi def link muttrcUnColorIndexNL	SpecialChar
+hi def link muttrcStringNL		SpecialChar
 
-delcommand HiLink
 
 let b:current_syntax = "muttrc"
 
diff --git a/runtime/syntax/mysql.vim b/runtime/syntax/mysql.vim
--- a/runtime/syntax/mysql.vim
+++ b/runtime/syntax/mysql.vim
@@ -271,20 +271,18 @@ syn region mysqlFunction         start="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mysqlKeyword            Statement
-HiLink mysqlSpecial            Special
-HiLink mysqlString             String
-HiLink mysqlNumber             Number
-HiLink mysqlVariable           Identifier
-HiLink mysqlComment            Comment
-HiLink mysqlType               Type
-HiLink mysqlOperator           Statement
-HiLink mysqlFlow               Statement
-HiLink mysqlFunction           Function
+hi def link mysqlKeyword            Statement
+hi def link mysqlSpecial            Special
+hi def link mysqlString             String
+hi def link mysqlNumber             Number
+hi def link mysqlVariable           Identifier
+hi def link mysqlComment            Comment
+hi def link mysqlType               Type
+hi def link mysqlOperator           Statement
+hi def link mysqlFlow               Statement
+hi def link mysqlFunction           Function
 
-delcommand HiLink
 
 let b:current_syntax = "mysql"
 
diff --git a/runtime/syntax/named.vim b/runtime/syntax/named.vim
--- a/runtime/syntax/named.vim
+++ b/runtime/syntax/named.vim
@@ -189,39 +189,37 @@ syn match	namedParenError	+}\([^;]\|$\)+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink namedComment	Comment
-HiLink namedInclude	Include
-HiLink namedKeyword	Keyword
-HiLink namedIntKeyword	Keyword
-HiLink namedIdentifier	Identifier
-HiLink namedIntIdent	Identifier
+hi def link namedComment	Comment
+hi def link namedInclude	Include
+hi def link namedKeyword	Keyword
+hi def link namedIntKeyword	Keyword
+hi def link namedIdentifier	Identifier
+hi def link namedIntIdent	Identifier
 
-HiLink namedString	String
-HiLink namedBool	Type
-HiLink namedNotBool	Error
-HiLink namedNumber	Number
-HiLink namedNotNumber	Error
+hi def link namedString	String
+hi def link namedBool	Type
+hi def link namedNotBool	Error
+hi def link namedNumber	Number
+hi def link namedNotNumber	Error
 
-HiLink namedOption	namedKeyword
-HiLink namedLogOption	namedKeyword
-HiLink namedCNOption	namedKeyword
-HiLink namedQSKeywords	Type
-HiLink namedCNKeywords	Type
-HiLink namedLogCategory	Type
-HiLink namedIPaddr	Number
-HiLink namedDomain	Identifier
-HiLink namedZoneOpt	namedKeyword
-HiLink namedZoneType	Type
-HiLink namedParenError	Error
-HiLink namedEParenError	Error
-HiLink namedIllegalDom	Error
-HiLink namedIPerror	Error
-HiLink namedSpareDot	Error
-HiLink namedError	Error
+hi def link namedOption	namedKeyword
+hi def link namedLogOption	namedKeyword
+hi def link namedCNOption	namedKeyword
+hi def link namedQSKeywords	Type
+hi def link namedCNKeywords	Type
+hi def link namedLogCategory	Type
+hi def link namedIPaddr	Number
+hi def link namedDomain	Identifier
+hi def link namedZoneOpt	namedKeyword
+hi def link namedZoneType	Type
+hi def link namedParenError	Error
+hi def link namedEParenError	Error
+hi def link namedIllegalDom	Error
+hi def link namedIPerror	Error
+hi def link namedSpareDot	Error
+hi def link namedError	Error
 
-delcommand HiLink
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -422,87 +422,85 @@ syn sync match	nasmSync	grouphere NONE	 
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink nasmInMacDirective	nasmDirective
-HiLink nasmInMacLabel		nasmLocalLabel
-HiLink nasmInMacLblWarn	nasmLabelWarn
-HiLink nasmInMacMacro		nasmMacro
-HiLink nasmInMacParam		nasmMacro
-HiLink nasmInMacParamNum	nasmDecNumber
-HiLink nasmInMacPreCondit	nasmPreCondit
-HiLink nasmInMacPreProc	nasmPreProc
-HiLink nasmInPreCondit	nasmPreCondit
-HiLink nasmInStructure	nasmStructure
-HiLink nasmStructureLabel	nasmStructure
+hi def link nasmInMacDirective	nasmDirective
+hi def link nasmInMacLabel		nasmLocalLabel
+hi def link nasmInMacLblWarn	nasmLabelWarn
+hi def link nasmInMacMacro		nasmMacro
+hi def link nasmInMacParam		nasmMacro
+hi def link nasmInMacParamNum	nasmDecNumber
+hi def link nasmInMacPreCondit	nasmPreCondit
+hi def link nasmInMacPreProc	nasmPreProc
+hi def link nasmInPreCondit	nasmPreCondit
+hi def link nasmInStructure	nasmStructure
+hi def link nasmStructureLabel	nasmStructure
 
 " Comment Group:
-HiLink nasmComment		Comment
-HiLink nasmSpecialComment	SpecialComment
-HiLink nasmInCommentTodo	Todo
+hi def link nasmComment		Comment
+hi def link nasmSpecialComment	SpecialComment
+hi def link nasmInCommentTodo	Todo
 
 " Constant Group:
-HiLink nasmString		String
-HiLink nasmStringError	Error
-HiLink nasmBinNumber		Number
-HiLink nasmOctNumber		Number
-HiLink nasmDecNumber		Number
-HiLink nasmHexNumber		Number
-HiLink nasmFltNumber		Float
-HiLink nasmNumberError	Error
+hi def link nasmString		String
+hi def link nasmStringError	Error
+hi def link nasmBinNumber		Number
+hi def link nasmOctNumber		Number
+hi def link nasmDecNumber		Number
+hi def link nasmHexNumber		Number
+hi def link nasmFltNumber		Float
+hi def link nasmNumberError	Error
 
 " Identifier Group:
-HiLink nasmLabel		Identifier
-HiLink nasmLocalLabel		Identifier
-HiLink nasmSpecialLabel	Special
-HiLink nasmLabelError		Error
-HiLink nasmLabelWarn		Todo
+hi def link nasmLabel		Identifier
+hi def link nasmLocalLabel		Identifier
+hi def link nasmSpecialLabel	Special
+hi def link nasmLabelError		Error
+hi def link nasmLabelWarn		Todo
 
 " PreProc Group:
-HiLink nasmPreProc		PreProc
-HiLink nasmDefine		Define
-HiLink nasmInclude		Include
-HiLink nasmMacro		Macro
-HiLink nasmPreCondit		PreCondit
-HiLink nasmPreProcError	Error
-HiLink nasmPreProcWarn	Todo
+hi def link nasmPreProc		PreProc
+hi def link nasmDefine		Define
+hi def link nasmInclude		Include
+hi def link nasmMacro		Macro
+hi def link nasmPreCondit		PreCondit
+hi def link nasmPreProcError	Error
+hi def link nasmPreProcWarn	Todo
 
 " Type Group:
-HiLink nasmType		Type
-HiLink nasmStorage		StorageClass
-HiLink nasmStructure		Structure
-HiLink nasmTypeError		Error
+hi def link nasmType		Type
+hi def link nasmStorage		StorageClass
+hi def link nasmStructure		Structure
+hi def link nasmTypeError		Error
 
 " Directive Group:
-HiLink nasmConstant		Constant
-HiLink nasmInstrModifier	Operator
-HiLink nasmRepeat		Repeat
-HiLink nasmDirective		Keyword
-HiLink nasmStdDirective	Operator
-HiLink nasmFmtDirective	Keyword
+hi def link nasmConstant		Constant
+hi def link nasmInstrModifier	Operator
+hi def link nasmRepeat		Repeat
+hi def link nasmDirective		Keyword
+hi def link nasmStdDirective	Operator
+hi def link nasmFmtDirective	Keyword
 
 " Register Group:
-HiLink nasmCtrlRegister	Special
-HiLink nasmDebugRegister	Debug
-HiLink nasmTestRegister	Special
-HiLink nasmRegisterError	Error
-HiLink nasmMemRefError	Error
+hi def link nasmCtrlRegister	Special
+hi def link nasmDebugRegister	Debug
+hi def link nasmTestRegister	Special
+hi def link nasmRegisterError	Error
+hi def link nasmMemRefError	Error
 
 " Instruction Group:
-HiLink nasmStdInstruction	Statement
-HiLink nasmSysInstruction	Statement
-HiLink nasmDbgInstruction	Debug
-HiLink nasmFpuInstruction	Statement
-HiLink nasmMmxInstruction	Statement
-HiLink nasmSseInstruction	Statement
-HiLink nasmNowInstruction	Statement
-HiLink nasmAmdInstruction	Special
-HiLink nasmCrxInstruction	Special
-HiLink nasmUndInstruction	Todo
-HiLink nasmInstructnError	Error
+hi def link nasmStdInstruction	Statement
+hi def link nasmSysInstruction	Statement
+hi def link nasmDbgInstruction	Debug
+hi def link nasmFpuInstruction	Statement
+hi def link nasmMmxInstruction	Statement
+hi def link nasmSseInstruction	Statement
+hi def link nasmNowInstruction	Statement
+hi def link nasmAmdInstruction	Special
+hi def link nasmCrxInstruction	Special
+hi def link nasmUndInstruction	Todo
+hi def link nasmInstructnError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "nasm"
 
diff --git a/runtime/syntax/nastran.vim b/runtime/syntax/nastran.vim
--- a/runtime/syntax/nastran.vim
+++ b/runtime/syntax/nastran.vim
@@ -153,30 +153,28 @@ syn region nastranBulkData start=+ *[Bb]
 syn keyword nastranUtilCard ECHOON ECHOOFF INCLUDE PARAM
 
 
-command -nargs=+ HiLink hi link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink nastranDmapexecmod	     Statement
-HiLink nastranDmapType	     Type
-HiLink nastranDmapPreCondit	     Error
-HiLink nastranDmapUtilmod	     PreProc
-HiLink nastranDmapMatmod	     nastranDmapUtilmod
-HiLink nastranDmapString	     String
-HiLink nastranDmapNumber	     Constant
-HiLink nastranDmapFloat	     nastranDmapNumber
-HiLink nastranDmapInitTab	     nastranDmapNumber
-HiLink nastranDmapTab		     nastranDmapNumber
-HiLink nastranDmapLogical	     nastranDmapExecmod
-HiLink nastranDmapImplicit	     Identifier
-HiLink nastranDmapComment	     Comment
-HiLink nastranDmapRepeat	     nastranDmapexecmod
-HiLink nastranNastranCard	     nastranDmapPreCondit
-HiLink nastranECSCard		     nastranDmapUtilmod
-HiLink nastranFMSCard		     nastranNastranCard
-HiLink nastranCC		     nastranDmapexecmod
-HiLink nastranDelimiter	     Special
-HiLink nastranBulkData	     nastranDmapType
-HiLink nastranUtilCard	     nastranDmapexecmod
-delcommand HiLink
+hi def link nastranDmapexecmod	     Statement
+hi def link nastranDmapType	     Type
+hi def link nastranDmapPreCondit	     Error
+hi def link nastranDmapUtilmod	     PreProc
+hi def link nastranDmapMatmod	     nastranDmapUtilmod
+hi def link nastranDmapString	     String
+hi def link nastranDmapNumber	     Constant
+hi def link nastranDmapFloat	     nastranDmapNumber
+hi def link nastranDmapInitTab	     nastranDmapNumber
+hi def link nastranDmapTab		     nastranDmapNumber
+hi def link nastranDmapLogical	     nastranDmapExecmod
+hi def link nastranDmapImplicit	     Identifier
+hi def link nastranDmapComment	     Comment
+hi def link nastranDmapRepeat	     nastranDmapexecmod
+hi def link nastranNastranCard	     nastranDmapPreCondit
+hi def link nastranECSCard		     nastranDmapUtilmod
+hi def link nastranFMSCard		     nastranNastranCard
+hi def link nastranCC		     nastranDmapexecmod
+hi def link nastranDelimiter	     Special
+hi def link nastranBulkData	     nastranDmapType
+hi def link nastranUtilCard	     nastranDmapexecmod
 
 let b:current_syntax = "nastran"
 
diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim
--- a/runtime/syntax/natural.vim
+++ b/runtime/syntax/natural.vim
@@ -148,59 +148,50 @@ if v:version >= 600
 endif
 
 
-if v:version >= 508 || !exists("did_natural_syntax_inits")
-  if v:version < 508
-    let did_natural_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  " The default methods for highlighting.  Can be overridden later
+" The default methods for highlighting.  Can be overridden later
+
+" Constants
+hi def link naturalFormat		Constant
+hi def link naturalAttribute	Constant
+hi def link naturalNumber		Number
+hi def link naturalString		String
+hi def link naturalBoolean		Boolean
 
-  " Constants
-  HiLink naturalFormat		Constant
-  HiLink naturalAttribute	Constant
-  HiLink naturalNumber		Number
-  HiLink naturalString		String
-  HiLink naturalBoolean		Boolean
-
-  " All kinds of keywords
-  HiLink naturalConditional	Conditional
-  HiLink naturalRepeat		Repeat
-  HiLink naturalLoop		Repeat
-  HiLink naturalFlow		Keyword
-  HiLink naturalError		Keyword
-  HiLink naturalKeyword		Keyword
-  HiLink naturalOperator	Operator
-  HiLink naturalParGui		Operator
+" All kinds of keywords
+hi def link naturalConditional	Conditional
+hi def link naturalRepeat		Repeat
+hi def link naturalLoop		Repeat
+hi def link naturalFlow		Keyword
+hi def link naturalError		Keyword
+hi def link naturalKeyword		Keyword
+hi def link naturalOperator	Operator
+hi def link naturalParGui		Operator
 
-  " Labels
-  HiLink naturalLabel		Label
-  HiLink naturalRefLabel	Label
+" Labels
+hi def link naturalLabel		Label
+hi def link naturalRefLabel	Label
 
-  " Comments
-  HiLink naturalPComment	Comment
-  HiLink naturalComment		Comment
-  HiLink naturalTodo		Todo
-  HiLink naturalCommentMark	PreProc
+" Comments
+hi def link naturalPComment	Comment
+hi def link naturalComment		Comment
+hi def link naturalTodo		Todo
+hi def link naturalCommentMark	PreProc
 
-  HiLink naturalInclude		Include
-  HiLink naturalSysVar		Identifier
-  HiLink naturalLineNo		LineNr
-  HiLink naturalLineRef		Error
-  HiLink naturalSpecial		Special
-  HiLink naturalComKey		Todo
+hi def link naturalInclude		Include
+hi def link naturalSysVar		Identifier
+hi def link naturalLineNo		LineNr
+hi def link naturalLineRef		Error
+hi def link naturalSpecial		Special
+hi def link naturalComKey		Todo
 
-  " illegal things
-  HiLink naturalRMKeyword	Error
-  HiLink naturalLegalIdent	Error
+" illegal things
+hi def link naturalRMKeyword	Error
+hi def link naturalLegalIdent	Error
 
-  HiLink naturalType		Type
-  HiLink naturalFunction	Function
-  HiLink naturalObjName		PreProc
+hi def link naturalType		Type
+hi def link naturalFunction	Function
+hi def link naturalObjName		PreProc
 
-  delcommand HiLink
-endif
 
 let b:current_syntax = "natural"
 
diff --git a/runtime/syntax/ncf.vim b/runtime/syntax/ncf.vim
--- a/runtime/syntax/ncf.vim
+++ b/runtime/syntax/ncf.vim
@@ -215,35 +215,33 @@ if exists("ncf_highlight_unknowns")
     syn match Error "[^ \t]*" contains=ALL
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink ncfCommands		Statement
-HiLink ncfSetCommands	ncfCommands
-HiLink ncfLogins		ncfCommands
-HiLink ncfString		String
-HiLink ncfContString	ncfString
-HiLink ncfComment		Comment
-HiLink ncfImplicit		Type
-HiLink ncfBoolean		Boolean
-HiLink ncfScript		Identifier
-HiLink ncfNumber		Number
-HiLink ncfIPAddr		ncfNumber
-HiLink ncfHexNumber		ncfNumber
-HiLink ncfTime		ncfNumber
-HiLink ncfDSTTime		ncfNumber
-HiLink ncfPath		Constant
-HiLink ncfServerName	Special
-HiLink ncfIPXNet		ncfServerName
-HiLink ncfTimeTypes		Constant
-HiLink ncfSetCommandsNum	   ncfSetCommands
-HiLink ncfSetCommandsBool	   ncfSetCommands
-HiLink ncfSetCommandsStr	   ncfSetCommands
-HiLink ncfSetCommandsTime	   ncfSetCommands
-HiLink ncfSetCommandsTimeDate  ncfSetCommands
-HiLink ncfSetCommandsBindCon   ncfSetCommands
+hi def link ncfCommands		Statement
+hi def link ncfSetCommands	ncfCommands
+hi def link ncfLogins		ncfCommands
+hi def link ncfString		String
+hi def link ncfContString	ncfString
+hi def link ncfComment		Comment
+hi def link ncfImplicit		Type
+hi def link ncfBoolean		Boolean
+hi def link ncfScript		Identifier
+hi def link ncfNumber		Number
+hi def link ncfIPAddr		ncfNumber
+hi def link ncfHexNumber		ncfNumber
+hi def link ncfTime		ncfNumber
+hi def link ncfDSTTime		ncfNumber
+hi def link ncfPath		Constant
+hi def link ncfServerName	Special
+hi def link ncfIPXNet		ncfServerName
+hi def link ncfTimeTypes		Constant
+hi def link ncfSetCommandsNum	   ncfSetCommands
+hi def link ncfSetCommandsBool	   ncfSetCommands
+hi def link ncfSetCommandsStr	   ncfSetCommands
+hi def link ncfSetCommandsTime	   ncfSetCommands
+hi def link ncfSetCommandsTimeDate  ncfSetCommands
+hi def link ncfSetCommandsBindCon   ncfSetCommands
 
-delcommand HiLink
 
 
 let b:current_syntax = "ncf"
diff --git a/runtime/syntax/nqc.vim b/runtime/syntax/nqc.vim
--- a/runtime/syntax/nqc.vim
+++ b/runtime/syntax/nqc.vim
@@ -324,43 +324,41 @@ exec "syn sync ccomment nqcComment minli
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink nqcLabel		Label
-HiLink nqcConditional		Conditional
-HiLink nqcRepeat		Repeat
-HiLink nqcCharacter		Character
-HiLink nqcNumber		Number
-HiLink nqcFloat		Float
-HiLink nqcFunction		Function
-HiLink nqcParenError		nqcError
-HiLink nqcErrInParen		nqcError
-HiLink nqcErrInBracket	nqcError
-HiLink nqcCommentL		nqcComment
-HiLink nqcCommentStart	nqcComment
-HiLink nqcCommentError	nqcError
-HiLink nqcCommentStartError	nqcError
-HiLink nqcSpaceError		nqcError
-HiLink nqcStorageClass	StorageClass
-HiLink nqcInclude		Include
-HiLink nqcPreProc		PreProc
-HiLink nqcDefine		Macro
-HiLink nqcIncluded		String
-HiLink nqcError		Error
-HiLink nqcStatement		Statement
-HiLink nqcEvents		Statement
-HiLink nqcPreCondit		PreCondit
-HiLink nqcType		Type
-HiLink nqcConstant		Constant
-HiLink nqcCommentSkip		nqcComment
-HiLink nqcComment		Comment
-HiLink nqcTodo		Todo
-HiLink nqcCppSkip		nqcCppOut
-HiLink nqcCppOut2		nqcCppOut
-HiLink nqcCppOut		Comment
+hi def link nqcLabel		Label
+hi def link nqcConditional		Conditional
+hi def link nqcRepeat		Repeat
+hi def link nqcCharacter		Character
+hi def link nqcNumber		Number
+hi def link nqcFloat		Float
+hi def link nqcFunction		Function
+hi def link nqcParenError		nqcError
+hi def link nqcErrInParen		nqcError
+hi def link nqcErrInBracket	nqcError
+hi def link nqcCommentL		nqcComment
+hi def link nqcCommentStart	nqcComment
+hi def link nqcCommentError	nqcError
+hi def link nqcCommentStartError	nqcError
+hi def link nqcSpaceError		nqcError
+hi def link nqcStorageClass	StorageClass
+hi def link nqcInclude		Include
+hi def link nqcPreProc		PreProc
+hi def link nqcDefine		Macro
+hi def link nqcIncluded		String
+hi def link nqcError		Error
+hi def link nqcStatement		Statement
+hi def link nqcEvents		Statement
+hi def link nqcPreCondit		PreCondit
+hi def link nqcType		Type
+hi def link nqcConstant		Constant
+hi def link nqcCommentSkip		nqcComment
+hi def link nqcComment		Comment
+hi def link nqcTodo		Todo
+hi def link nqcCppSkip		nqcCppOut
+hi def link nqcCppOut2		nqcCppOut
+hi def link nqcCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "nqc"
 
diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim
--- a/runtime/syntax/nroff.vim
+++ b/runtime/syntax/nroff.vim
@@ -196,53 +196,51 @@ syn keyword nroffTodo TODO XXX FIXME con
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
 
-HiLink nroffEscChar nroffSpecialChar
-HiLink nroffEscCharAr nroffSpecialChar
-HiLink nroffSpecialChar SpecialChar
-HiLink nroffSpace Delimiter
+hi def link nroffEscChar nroffSpecialChar
+hi def link nroffEscCharAr nroffSpecialChar
+hi def link nroffSpecialChar SpecialChar
+hi def link nroffSpace Delimiter
 
-HiLink nroffEscRegArg2 nroffEscRegArg
-HiLink nroffEscRegArg nroffIdent
+hi def link nroffEscRegArg2 nroffEscRegArg
+hi def link nroffEscRegArg nroffIdent
 
-HiLink nroffEscArg2 nroffEscArg
-HiLink nroffEscPar nroffEscape
+hi def link nroffEscArg2 nroffEscArg
+hi def link nroffEscPar nroffEscape
 
-HiLink nroffEscRegPar nroffEscape
-HiLink nroffEscArg nroffEscape
-HiLink nroffSize nroffEscape
-HiLink nroffEscape Preproc
+hi def link nroffEscRegPar nroffEscape
+hi def link nroffEscArg nroffEscape
+hi def link nroffSize nroffEscape
+hi def link nroffEscape Preproc
 
-HiLink nroffIgnore Comment
-HiLink nroffComment Comment
-HiLink nroffTodo Todo
+hi def link nroffIgnore Comment
+hi def link nroffComment Comment
+hi def link nroffTodo Todo
 
-HiLink nroffReqLeader nroffRequest
-HiLink nroffReqName nroffRequest
-HiLink nroffRequest Statement
-HiLink nroffCond PreCondit
-HiLink nroffDefIdent nroffIdent
-HiLink nroffIdent Identifier
+hi def link nroffReqLeader nroffRequest
+hi def link nroffReqName nroffRequest
+hi def link nroffRequest Statement
+hi def link nroffCond PreCondit
+hi def link nroffDefIdent nroffIdent
+hi def link nroffIdent Identifier
 
-HiLink nroffEquation PreProc
-HiLink nroffTable PreProc
-HiLink nroffPicture PreProc
-HiLink nroffRefer PreProc
-HiLink nroffGrap PreProc
-HiLink nroffGremlin PreProc
+hi def link nroffEquation PreProc
+hi def link nroffTable PreProc
+hi def link nroffPicture PreProc
+hi def link nroffRefer PreProc
+hi def link nroffGrap PreProc
+hi def link nroffGremlin PreProc
 
-HiLink nroffNumber Number
-HiLink nroffBadChar nroffError
-HiLink nroffSpaceError nroffError
-HiLink nroffError Error
+hi def link nroffNumber Number
+hi def link nroffBadChar nroffError
+hi def link nroffSpaceError nroffError
+hi def link nroffError Error
 
-HiLink nroffPreserve String
-HiLink nroffString String
-HiLink nroffDefinition String
-HiLink nroffDefSpecial Special
+hi def link nroffPreserve String
+hi def link nroffString String
+hi def link nroffDefinition String
+hi def link nroffDefSpecial Special
 
-delcommand HiLink
 
 let b:current_syntax = "nroff"
 
diff --git a/runtime/syntax/nsis.vim b/runtime/syntax/nsis.vim
--- a/runtime/syntax/nsis.vim
+++ b/runtime/syntax/nsis.vim
@@ -222,37 +222,35 @@ syn keyword nsisError		UninstallExeName
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink nsisInstruction		Function
-HiLink nsisComment			Comment
-HiLink nsisLocalLabel			Label
-HiLink nsisGlobalLabel		Label
-HiLink nsisStatement			Statement
-HiLink nsisString			String
-HiLink nsisBoolean			Boolean
-HiLink nsisAttribOptions		Constant
-HiLink nsisExecShell			Constant
-HiLink nsisFileAttrib			Constant
-HiLink nsisMessageBox			Constant
-HiLink nsisRegistry			Identifier
-HiLink nsisNumber			Number
-HiLink nsisError			Error
-HiLink nsisUserVar			Identifier
-HiLink nsisSysVar			Identifier
-HiLink nsisAttribute			Type
-HiLink nsisCompiler			Type
-HiLink nsisTodo			Todo
-HiLink nsisCallback			Operator
+hi def link nsisInstruction		Function
+hi def link nsisComment			Comment
+hi def link nsisLocalLabel			Label
+hi def link nsisGlobalLabel		Label
+hi def link nsisStatement			Statement
+hi def link nsisString			String
+hi def link nsisBoolean			Boolean
+hi def link nsisAttribOptions		Constant
+hi def link nsisExecShell			Constant
+hi def link nsisFileAttrib			Constant
+hi def link nsisMessageBox			Constant
+hi def link nsisRegistry			Identifier
+hi def link nsisNumber			Number
+hi def link nsisError			Error
+hi def link nsisUserVar			Identifier
+hi def link nsisSysVar			Identifier
+hi def link nsisAttribute			Type
+hi def link nsisCompiler			Type
+hi def link nsisTodo			Todo
+hi def link nsisCallback			Operator
 " preprocessor commands
-HiLink nsisPreprocSubst		PreProc
-HiLink nsisDefine			Define
-HiLink nsisMacro			Macro
-HiLink nsisPreCondit			PreCondit
-HiLink nsisInclude			Include
-HiLink nsisSystem			PreProc
+hi def link nsisPreprocSubst		PreProc
+hi def link nsisDefine			Define
+hi def link nsisMacro			Macro
+hi def link nsisPreCondit			PreCondit
+hi def link nsisInclude			Include
+hi def link nsisSystem			PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "nsis"
 
diff --git a/runtime/syntax/obj.vim b/runtime/syntax/obj.vim
--- a/runtime/syntax/obj.vim
+++ b/runtime/syntax/obj.vim
@@ -60,25 +60,23 @@ syn match       objIndex        "\d\+\/\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink objError           Error
-HiLink objComment         Comment
-HiLink objInclude         PreProc
-HiLink objFloat           Float
-HiLink objInt             Number
-HiLink objGroup           Structure
-HiLink objIndex           Constant
-HiLink objMaterial        Label
+hi def link objError           Error
+hi def link objComment         Comment
+hi def link objInclude         PreProc
+hi def link objFloat           Float
+hi def link objInt             Number
+hi def link objGroup           Structure
+hi def link objIndex           Constant
+hi def link objMaterial        Label
 
-HiLink objVertex          Keyword
-HiLink objNormale         Keyword
-HiLink objVertice         Keyword
-HiLink objFace            Keyword
-HiLink objKeywords        Keyword
+hi def link objVertex          Keyword
+hi def link objNormale         Keyword
+hi def link objVertice         Keyword
+hi def link objFace            Keyword
+hi def link objKeywords        Keyword
 
 
-delcommand HiLink
 
 let b:current_syntax = "obj"
 
diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim
--- a/runtime/syntax/ocaml.vim
+++ b/runtime/syntax/ocaml.vim
@@ -251,69 +251,67 @@ syn sync match ocamlSigSync     groupthe
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ocamlBraceErr	   Error
-HiLink ocamlBrackErr	   Error
-HiLink ocamlParenErr	   Error
-HiLink ocamlArrErr	   Error
+hi def link ocamlBraceErr	   Error
+hi def link ocamlBrackErr	   Error
+hi def link ocamlParenErr	   Error
+hi def link ocamlArrErr	   Error
 
-HiLink ocamlCommentErr   Error
+hi def link ocamlCommentErr   Error
 
-HiLink ocamlCountErr	   Error
-HiLink ocamlDoErr	   Error
-HiLink ocamlDoneErr	   Error
-HiLink ocamlEndErr	   Error
-HiLink ocamlThenErr	   Error
+hi def link ocamlCountErr	   Error
+hi def link ocamlDoErr	   Error
+hi def link ocamlDoneErr	   Error
+hi def link ocamlEndErr	   Error
+hi def link ocamlThenErr	   Error
 
-HiLink ocamlCharErr	   Error
+hi def link ocamlCharErr	   Error
 
-HiLink ocamlErr	   Error
+hi def link ocamlErr	   Error
 
-HiLink ocamlComment	   Comment
+hi def link ocamlComment	   Comment
 
-HiLink ocamlModPath	   Include
-HiLink ocamlObject	   Include
-HiLink ocamlModule	   Include
-HiLink ocamlModParam1    Include
-HiLink ocamlModType	   Include
-HiLink ocamlMPRestr3	   Include
-HiLink ocamlFullMod	   Include
-HiLink ocamlModTypeRestr Include
-HiLink ocamlWith	   Include
-HiLink ocamlMTDef	   Include
+hi def link ocamlModPath	   Include
+hi def link ocamlObject	   Include
+hi def link ocamlModule	   Include
+hi def link ocamlModParam1    Include
+hi def link ocamlModType	   Include
+hi def link ocamlMPRestr3	   Include
+hi def link ocamlFullMod	   Include
+hi def link ocamlModTypeRestr Include
+hi def link ocamlWith	   Include
+hi def link ocamlMTDef	   Include
 
-HiLink ocamlScript	   Include
-
-HiLink ocamlConstructor  Constant
+hi def link ocamlScript	   Include
 
-HiLink ocamlVal          Keyword
-HiLink ocamlModPreRHS    Keyword
-HiLink ocamlMPRestr2	   Keyword
-HiLink ocamlKeyword	   Keyword
-HiLink ocamlMethod	   Include
-HiLink ocamlFunDef	   Keyword
-HiLink ocamlRefAssign    Keyword
-HiLink ocamlKeyChar	   Keyword
-HiLink ocamlAnyVar	   Keyword
-HiLink ocamlTopStop	   Keyword
-HiLink ocamlOperator	   Keyword
+hi def link ocamlConstructor  Constant
 
-HiLink ocamlBoolean	   Boolean
-HiLink ocamlCharacter    Character
-HiLink ocamlNumber	   Number
-HiLink ocamlFloat	   Float
-HiLink ocamlString	   String
-
-HiLink ocamlLabel	   Identifier
+hi def link ocamlVal          Keyword
+hi def link ocamlModPreRHS    Keyword
+hi def link ocamlMPRestr2	   Keyword
+hi def link ocamlKeyword	   Keyword
+hi def link ocamlMethod	   Include
+hi def link ocamlFunDef	   Keyword
+hi def link ocamlRefAssign    Keyword
+hi def link ocamlKeyChar	   Keyword
+hi def link ocamlAnyVar	   Keyword
+hi def link ocamlTopStop	   Keyword
+hi def link ocamlOperator	   Keyword
 
-HiLink ocamlType	   Type
-
-HiLink ocamlTodo	   Todo
+hi def link ocamlBoolean	   Boolean
+hi def link ocamlCharacter    Character
+hi def link ocamlNumber	   Number
+hi def link ocamlFloat	   Float
+hi def link ocamlString	   String
 
-HiLink ocamlEncl	   Keyword
+hi def link ocamlLabel	   Identifier
+
+hi def link ocamlType	   Type
 
-delcommand HiLink
+hi def link ocamlTodo	   Todo
+
+hi def link ocamlEncl	   Keyword
+
 
 let b:current_syntax = "ocaml"
 
diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim
--- a/runtime/syntax/occam.vim
+++ b/runtime/syntax/occam.vim
@@ -85,34 +85,32 @@ syn match occamCDString		/<\|>\|=\|(\|)/
 
 syn region occamCDirective	start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink occamType Type
-HiLink occamKeyword Keyword
-HiLink occamComment Comment
-HiLink occamCommentTitle PreProc
-HiLink occamTodo Todo
-HiLink occamNote Todo
-HiLink occamString String
-HiLink occamCharString String
-HiLink occamNumber Number
-HiLink occamCDirective PreProc
-HiLink occamCDString String
-HiLink occamPPIdentifier PreProc
-HiLink occamBoolean Boolean
-HiLink occamSpecialChar SpecialChar
-HiLink occamChar Character
-HiLink occamStructure Structure
-HiLink occamIdentifier Identifier
-HiLink occamConstant Constant
-HiLink occamOperator Operator
-HiLink occamFunction Ignore
-HiLink occamRepeat Repeat
-HiLink occamConditional Conditional
-HiLink occamBrackets Type
-HiLink occamParantheses Delimiter
+hi def link occamType Type
+hi def link occamKeyword Keyword
+hi def link occamComment Comment
+hi def link occamCommentTitle PreProc
+hi def link occamTodo Todo
+hi def link occamNote Todo
+hi def link occamString String
+hi def link occamCharString String
+hi def link occamNumber Number
+hi def link occamCDirective PreProc
+hi def link occamCDString String
+hi def link occamPPIdentifier PreProc
+hi def link occamBoolean Boolean
+hi def link occamSpecialChar SpecialChar
+hi def link occamChar Character
+hi def link occamStructure Structure
+hi def link occamIdentifier Identifier
+hi def link occamConstant Constant
+hi def link occamOperator Operator
+hi def link occamFunction Ignore
+hi def link occamRepeat Repeat
+hi def link occamConditional Conditional
+hi def link occamBrackets Type
+hi def link occamParantheses Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "occam"
 
diff --git a/runtime/syntax/omnimark.vim b/runtime/syntax/omnimark.vim
--- a/runtime/syntax/omnimark.vim
+++ b/runtime/syntax/omnimark.vim
@@ -90,17 +90,15 @@ syn sync minlines=2000
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink omnimarkCommands		Statement
-HiLink omnimarkKeywords		Identifier
-HiLink omnimarkString		String
-HiLink omnimarkPatterns		Macro
-"  HiLink omnimarkNumber			Number
-HiLink omnimarkComment		Comment
-HiLink omnimarkEscape		Special
+hi def link omnimarkCommands		Statement
+hi def link omnimarkKeywords		Identifier
+hi def link omnimarkString		String
+hi def link omnimarkPatterns		Macro
+"  hi def link omnimarkNumber			Number
+hi def link omnimarkComment		Comment
+hi def link omnimarkEscape		Special
 
-delcommand HiLink
 
 let b:current_syntax = "omnimark"
 
diff --git a/runtime/syntax/openroad.vim b/runtime/syntax/openroad.vim
--- a/runtime/syntax/openroad.vim
+++ b/runtime/syntax/openroad.vim
@@ -233,22 +233,20 @@ endif
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
 
-HiLink openroadKeyword	Statement
-HiLink openroadNumber	Number
-HiLink openroadString	String
-HiLink openroadComment	Comment
-HiLink openroadOperator	Operator
-HiLink openroadType		Type
-HiLink openroadFunc		Special
-HiLink openroadClass	Type
-HiLink openroadEvent	Statement
-HiLink openroadConst	Constant
-HiLink openroadVar		Identifier
-HiLink openroadIdent	Identifier
-HiLink openroadTodo		Todo
+hi def link openroadKeyword	Statement
+hi def link openroadNumber	Number
+hi def link openroadString	String
+hi def link openroadComment	Comment
+hi def link openroadOperator	Operator
+hi def link openroadType		Type
+hi def link openroadFunc		Special
+hi def link openroadClass	Type
+hi def link openroadEvent	Statement
+hi def link openroadConst	Constant
+hi def link openroadVar		Identifier
+hi def link openroadIdent	Identifier
+hi def link openroadTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "openroad"
diff --git a/runtime/syntax/opl.vim b/runtime/syntax/opl.vim
--- a/runtime/syntax/opl.vim
+++ b/runtime/syntax/opl.vim
@@ -73,16 +73,14 @@ syn match   OPLMathsOperator    "-\|=\|[
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink OPLStatement		Statement
-HiLink OPLNumber		Number
-HiLink OPLString		String
-HiLink OPLComment		Comment
-HiLink OPLMathsOperator	Conditional
-"  HiLink OPLError		Error
+hi def link OPLStatement		Statement
+hi def link OPLNumber		Number
+hi def link OPLString		String
+hi def link OPLComment		Comment
+hi def link OPLMathsOperator	Conditional
+"  hi def link OPLError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "opl"
 
diff --git a/runtime/syntax/ora.vim b/runtime/syntax/ora.vim
--- a/runtime/syntax/ora.vim
+++ b/runtime/syntax/ora.vim
@@ -436,25 +436,23 @@ syn cluster oraAll add=oraValue,oraModif
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink oraKeyword	  Statement		"usual keywords
-HiLink oraKeywordGroup  Type			"keywords which group other keywords
-HiLink oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
-HiLink oraKeywordObs	  Todo			"obsolete keywords
-HiLink oraKeywordUnd	  PreProc		"undocumented keywords
-HiLink oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
-HiLink oraValue	  Identifier		"values, like true or false
-HiLink oraModifier	  oraValue		"modifies values
-HiLink oraString	  String		"strings
+hi def link oraKeyword	  Statement		"usual keywords
+hi def link oraKeywordGroup  Type			"keywords which group other keywords
+hi def link oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
+hi def link oraKeywordObs	  Todo			"obsolete keywords
+hi def link oraKeywordUnd	  PreProc		"undocumented keywords
+hi def link oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
+hi def link oraValue	  Identifier		"values, like true or false
+hi def link oraModifier	  oraValue		"modifies values
+hi def link oraString	  String		"strings
 
-HiLink oraSpecial	  Special		"special characters
-HiLink oraError	  Error			"errors
-HiLink oraParenError	  oraError		"errors caused by mismatching parantheses
+hi def link oraSpecial	  Special		"special characters
+hi def link oraError	  Error			"errors
+hi def link oraParenError	  oraError		"errors caused by mismatching parantheses
 
-HiLink oraComment	  Comment		"comments
+hi def link oraComment	  Comment		"comments
 
-delcommand HiLink
 
 
 let b:current_syntax = "ora"
diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim
--- a/runtime/syntax/pascal.vim
+++ b/runtime/syntax/pascal.vim
@@ -318,43 +318,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pascalAcces		pascalStatement
-HiLink pascalBoolean		Boolean
-HiLink pascalComment		Comment
-HiLink pascalConditional	Conditional
-HiLink pascalConstant		Constant
-HiLink pascalDelimiter	Identifier
-HiLink pascalDirective	pascalStatement
-HiLink pascalException	Exception
-HiLink pascalFloat		Float
-HiLink pascalFunction		Function
-HiLink pascalLabel		Label
-HiLink pascalMatrixDelimiter	Identifier
-HiLink pascalModifier		Type
-HiLink pascalNumber		Number
-HiLink pascalOperator		Operator
-HiLink pascalPredefined	pascalStatement
-HiLink pascalPreProc		PreProc
-HiLink pascalRepeat		Repeat
-HiLink pascalSpaceError	Error
-HiLink pascalStatement	Statement
-HiLink pascalString		String
-HiLink pascalStringEscape	Special
-HiLink pascalStringEscapeGPC	Special
-HiLink pascalStringError	Error
-HiLink pascalStruct		pascalStatement
-HiLink pascalSymbolOperator	pascalOperator
-HiLink pascalTodo		Todo
-HiLink pascalType		Type
-HiLink pascalUnclassified	pascalStatement
-"  HiLink pascalAsm		Assembler
-HiLink pascalError		Error
-HiLink pascalAsmKey		pascalStatement
-HiLink pascalShowTab		Error
+hi def link pascalAcces		pascalStatement
+hi def link pascalBoolean		Boolean
+hi def link pascalComment		Comment
+hi def link pascalConditional	Conditional
+hi def link pascalConstant		Constant
+hi def link pascalDelimiter	Identifier
+hi def link pascalDirective	pascalStatement
+hi def link pascalException	Exception
+hi def link pascalFloat		Float
+hi def link pascalFunction		Function
+hi def link pascalLabel		Label
+hi def link pascalMatrixDelimiter	Identifier
+hi def link pascalModifier		Type
+hi def link pascalNumber		Number
+hi def link pascalOperator		Operator
+hi def link pascalPredefined	pascalStatement
+hi def link pascalPreProc		PreProc
+hi def link pascalRepeat		Repeat
+hi def link pascalSpaceError	Error
+hi def link pascalStatement	Statement
+hi def link pascalString		String
+hi def link pascalStringEscape	Special
+hi def link pascalStringEscapeGPC	Special
+hi def link pascalStringError	Error
+hi def link pascalStruct		pascalStatement
+hi def link pascalSymbolOperator	pascalOperator
+hi def link pascalTodo		Todo
+hi def link pascalType		Type
+hi def link pascalUnclassified	pascalStatement
+"  hi def link pascalAsm		Assembler
+hi def link pascalError		Error
+hi def link pascalAsmKey		pascalStatement
+hi def link pascalShowTab		Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "pascal"
diff --git a/runtime/syntax/pcap.vim b/runtime/syntax/pcap.vim
--- a/runtime/syntax/pcap.vim
+++ b/runtime/syntax/pcap.vim
@@ -37,13 +37,11 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pcapBad WarningMsg
-HiLink pcapBadword WarningMsg
-HiLink pcapComment Comment
+hi def link pcapBad WarningMsg
+hi def link pcapBadword WarningMsg
+hi def link pcapComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "pcap"
 
diff --git a/runtime/syntax/pccts.vim b/runtime/syntax/pccts.vim
--- a/runtime/syntax/pccts.vim
+++ b/runtime/syntax/pccts.vim
@@ -66,25 +66,23 @@ syn sync match pcctsSyncRule grouphere p
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pcctsDelim		Special
-HiLink pcctsTokenName		Identifier
-HiLink pcctsRuleName		Statement
-HiLink pcctsLabelHack		Label
-HiLink pcctsDirective		PreProc
-HiLink pcctsString		String
-HiLink pcctsComment		Comment
-HiLink pcctsClass		Statement
-HiLink pcctsClassName		Identifier
-HiLink pcctsException		Statement
-HiLink pcctsExceptionHandler	Keyword
-HiLink pcctsExceptionRuleRef	pcctsDelim
-HiLink pcctsExceptionID	Identifier
-HiLink pcctsRuleRef		Identifier
-HiLink pcctsSpecialChar	SpecialChar
+hi def link pcctsDelim		Special
+hi def link pcctsTokenName		Identifier
+hi def link pcctsRuleName		Statement
+hi def link pcctsLabelHack		Label
+hi def link pcctsDirective		PreProc
+hi def link pcctsString		String
+hi def link pcctsComment		Comment
+hi def link pcctsClass		Statement
+hi def link pcctsClassName		Identifier
+hi def link pcctsException		Statement
+hi def link pcctsExceptionHandler	Keyword
+hi def link pcctsExceptionRuleRef	pcctsDelim
+hi def link pcctsExceptionID	Identifier
+hi def link pcctsRuleRef		Identifier
+hi def link pcctsSpecialChar	SpecialChar
 
-delcommand HiLink
 
 let b:current_syntax = "pccts"
 
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim
--- a/runtime/syntax/perl.vim
+++ b/runtime/syntax/perl.vim
@@ -435,121 +435,119 @@ else
   syn sync minlines=0
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE: If you're linking new highlight groups to perlString, please also put
 "       them into b:match_skip in ftplugin/perl.vim.
 
 " The default highlighting.
-HiLink perlSharpBang		PreProc
-HiLink perlControl		PreProc
-HiLink perlInclude		Include
-HiLink perlSpecial		Special
-HiLink perlString		String
-HiLink perlCharacter		Character
-HiLink perlNumber		Number
-HiLink perlFloat		Float
-HiLink perlType			Type
-HiLink perlIdentifier		Identifier
-HiLink perlLabel		Label
-HiLink perlStatement		Statement
-HiLink perlConditional		Conditional
-HiLink perlRepeat		Repeat
-HiLink perlOperator		Operator
-HiLink perlFunction		Keyword
-HiLink perlSubName		Function
-HiLink perlSubPrototype		Type
-HiLink perlSubAttributes	PreProc
-HiLink perlSubAttributesCont	perlSubAttributes
-HiLink perlComment		Comment
-HiLink perlTodo			Todo
+hi def link perlSharpBang		PreProc
+hi def link perlControl		PreProc
+hi def link perlInclude		Include
+hi def link perlSpecial		Special
+hi def link perlString		String
+hi def link perlCharacter		Character
+hi def link perlNumber		Number
+hi def link perlFloat		Float
+hi def link perlType			Type
+hi def link perlIdentifier		Identifier
+hi def link perlLabel		Label
+hi def link perlStatement		Statement
+hi def link perlConditional		Conditional
+hi def link perlRepeat		Repeat
+hi def link perlOperator		Operator
+hi def link perlFunction		Keyword
+hi def link perlSubName		Function
+hi def link perlSubPrototype		Type
+hi def link perlSubAttributes	PreProc
+hi def link perlSubAttributesCont	perlSubAttributes
+hi def link perlComment		Comment
+hi def link perlTodo			Todo
 if exists("perl_string_as_statement")
-  HiLink perlStringStartEnd	perlStatement
+  hi def link perlStringStartEnd	perlStatement
 else
-  HiLink perlStringStartEnd	perlString
+  hi def link perlStringStartEnd	perlString
 endif
-HiLink perlVStringV		perlStringStartEnd
-HiLink perlList			perlStatement
-HiLink perlMisc			perlStatement
-HiLink perlVarPlain		perlIdentifier
-HiLink perlVarPlain2		perlIdentifier
-HiLink perlArrow		perlIdentifier
-HiLink perlFiledescRead		perlIdentifier
-HiLink perlFiledescStatement	perlIdentifier
-HiLink perlVarSimpleMember	perlIdentifier
-HiLink perlVarSimpleMemberName 	perlString
-HiLink perlVarNotInMatches	perlIdentifier
-HiLink perlVarSlash		perlIdentifier
-HiLink perlQQ			perlString
-HiLink perlHereDoc		perlString
-HiLink perlStringUnexpanded	perlString
-HiLink perlSubstitutionSQ	perlString
-HiLink perlSubstitutionGQQ	perlString
-HiLink perlTranslationGQ	perlString
-HiLink perlMatch		perlString
-HiLink perlMatchStartEnd	perlStatement
-HiLink perlFormatName		perlIdentifier
-HiLink perlFormatField		perlString
-HiLink perlPackageDecl		perlType
-HiLink perlStorageClass		perlType
-HiLink perlPackageRef		perlType
-HiLink perlStatementPackage	perlStatement
-HiLink perlStatementStorage	perlStatement
-HiLink perlStatementControl	perlStatement
-HiLink perlStatementScalar	perlStatement
-HiLink perlStatementRegexp	perlStatement
-HiLink perlStatementNumeric	perlStatement
-HiLink perlStatementList	perlStatement
-HiLink perlStatementHash	perlStatement
-HiLink perlStatementIOfunc	perlStatement
-HiLink perlStatementFiledesc	perlStatement
-HiLink perlStatementVector	perlStatement
-HiLink perlStatementFiles	perlStatement
-HiLink perlStatementFlow	perlStatement
-HiLink perlStatementInclude	perlStatement
-HiLink perlStatementProc	perlStatement
-HiLink perlStatementSocket	perlStatement
-HiLink perlStatementIPC		perlStatement
-HiLink perlStatementNetwork	perlStatement
-HiLink perlStatementPword	perlStatement
-HiLink perlStatementTime	perlStatement
-HiLink perlStatementMisc	perlStatement
-HiLink perlStatementIndirObj	perlStatement
-HiLink perlFunctionName		perlIdentifier
-HiLink perlMethod		perlIdentifier
-HiLink perlFunctionPRef		perlType
-HiLink perlPOD			perlComment
-HiLink perlShellCommand		perlString
-HiLink perlSpecialAscii		perlSpecial
-HiLink perlSpecialDollar	perlSpecial
-HiLink perlSpecialString	perlSpecial
-HiLink perlSpecialStringU	perlSpecial
-HiLink perlSpecialMatch		perlSpecial
-HiLink perlDATA			perlComment
+hi def link perlVStringV		perlStringStartEnd
+hi def link perlList			perlStatement
+hi def link perlMisc			perlStatement
+hi def link perlVarPlain		perlIdentifier
+hi def link perlVarPlain2		perlIdentifier
+hi def link perlArrow		perlIdentifier
+hi def link perlFiledescRead		perlIdentifier
+hi def link perlFiledescStatement	perlIdentifier
+hi def link perlVarSimpleMember	perlIdentifier
+hi def link perlVarSimpleMemberName 	perlString
+hi def link perlVarNotInMatches	perlIdentifier
+hi def link perlVarSlash		perlIdentifier
+hi def link perlQQ			perlString
+hi def link perlHereDoc		perlString
+hi def link perlStringUnexpanded	perlString
+hi def link perlSubstitutionSQ	perlString
+hi def link perlSubstitutionGQQ	perlString
+hi def link perlTranslationGQ	perlString
+hi def link perlMatch		perlString
+hi def link perlMatchStartEnd	perlStatement
+hi def link perlFormatName		perlIdentifier
+hi def link perlFormatField		perlString
+hi def link perlPackageDecl		perlType
+hi def link perlStorageClass		perlType
+hi def link perlPackageRef		perlType
+hi def link perlStatementPackage	perlStatement
+hi def link perlStatementStorage	perlStatement
+hi def link perlStatementControl	perlStatement
+hi def link perlStatementScalar	perlStatement
+hi def link perlStatementRegexp	perlStatement
+hi def link perlStatementNumeric	perlStatement
+hi def link perlStatementList	perlStatement
+hi def link perlStatementHash	perlStatement
+hi def link perlStatementIOfunc	perlStatement
+hi def link perlStatementFiledesc	perlStatement
+hi def link perlStatementVector	perlStatement
+hi def link perlStatementFiles	perlStatement
+hi def link perlStatementFlow	perlStatement
+hi def link perlStatementInclude	perlStatement
+hi def link perlStatementProc	perlStatement
+hi def link perlStatementSocket	perlStatement
+hi def link perlStatementIPC		perlStatement
+hi def link perlStatementNetwork	perlStatement
+hi def link perlStatementPword	perlStatement
+hi def link perlStatementTime	perlStatement
+hi def link perlStatementMisc	perlStatement
+hi def link perlStatementIndirObj	perlStatement
+hi def link perlFunctionName		perlIdentifier
+hi def link perlMethod		perlIdentifier
+hi def link perlFunctionPRef		perlType
+hi def link perlPOD			perlComment
+hi def link perlShellCommand		perlString
+hi def link perlSpecialAscii		perlSpecial
+hi def link perlSpecialDollar	perlSpecial
+hi def link perlSpecialString	perlSpecial
+hi def link perlSpecialStringU	perlSpecial
+hi def link perlSpecialMatch		perlSpecial
+hi def link perlDATA			perlComment
 
 " NOTE: Due to a bug in Vim (or more likely, a misunderstanding on my part),
 "       I had to remove the transparent property from the following regions
 "       in order to get them to highlight correctly.  Feel free to remove
 "       these and reinstate the transparent property if you know how.
-HiLink perlParensSQ		perlString
-HiLink perlBracketsSQ		perlString
-HiLink perlBracesSQ		perlString
-HiLink perlAnglesSQ		perlString
+hi def link perlParensSQ		perlString
+hi def link perlBracketsSQ		perlString
+hi def link perlBracesSQ		perlString
+hi def link perlAnglesSQ		perlString
 
-HiLink perlParensDQ		perlString
-HiLink perlBracketsDQ		perlString
-HiLink perlBracesDQ		perlString
-HiLink perlAnglesDQ		perlString
+hi def link perlParensDQ		perlString
+hi def link perlBracketsDQ		perlString
+hi def link perlBracesDQ		perlString
+hi def link perlAnglesDQ		perlString
 
-HiLink perlSpecialStringU2	perlString
+hi def link perlSpecialStringU2	perlString
 
 " Possible errors
-HiLink perlNotEmptyLine		Error
-HiLink perlElseIfError		Error
-HiLink perlSubPrototypeError	Error
-HiLink perlSubError		Error
+hi def link perlNotEmptyLine		Error
+hi def link perlElseIfError		Error
+hi def link perlSubPrototypeError	Error
+hi def link perlSubError		Error
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "
diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -2061,167 +2061,165 @@ syn region p6PodFormatFrench
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink p6EscOctOld       p6Error
-HiLink p6PackageTwigil   p6Twigil
-HiLink p6StringAngle     p6String
-HiLink p6StringFrench    p6String
-HiLink p6StringAngles    p6String
-HiLink p6StringSQ        p6String
-HiLink p6StringDQ        p6String
-HiLink p6StringQ         p6String
-HiLink p6RxStringSQ      p6String
-HiLink p6RxStringDQ      p6String
-HiLink p6Substitution    p6String
-HiLink p6Transliteration p6String
-HiLink p6StringAuto      p6String
-HiLink p6StringP5Auto    p6String
-HiLink p6Key             p6String
-HiLink p6Match           p6String
-HiLink p6RegexBlock      p6String
-HiLink p6RxP5CharClass   p6String
-HiLink p6RxP5QuoteMeta   p6String
-HiLink p6RxCharClass     p6String
-HiLink p6RxQuoteWords    p6String
-HiLink p6ReduceOp        p6Operator
-HiLink p6ReverseCrossOp  p6Operator
-HiLink p6HyperOp         p6Operator
-HiLink p6QuoteQ          p6Operator
-HiLink p6RxRange         p6StringSpecial
-HiLink p6RxAnchor        p6StringSpecial
-HiLink p6RxP5Anchor      p6StringSpecial
-HiLink p6CodePoint       p6StringSpecial
-HiLink p6RxMeta          p6StringSpecial
-HiLink p6RxP5Range       p6StringSpecial
-HiLink p6RxP5CPId        p6StringSpecial
-HiLink p6RxP5Posix       p6StringSpecial
-HiLink p6RxP5Mod         p6StringSpecial
-HiLink p6RxP5HexSeq      p6StringSpecial
-HiLink p6RxP5OctSeq      p6StringSpecial
-HiLink p6RxP5WriteRefId  p6StringSpecial
-HiLink p6HexSequence     p6StringSpecial
-HiLink p6OctSequence     p6StringSpecial
-HiLink p6RxP5Named       p6StringSpecial
-HiLink p6RxP5PropId      p6StringSpecial
-HiLink p6RxP5Quantifier  p6StringSpecial
-HiLink p6RxP5CountId     p6StringSpecial
-HiLink p6RxP5Verb        p6StringSpecial
-HiLink p6Escape          p6StringSpecial2
-HiLink p6EscNull         p6StringSpecial2
-HiLink p6EscHash         p6StringSpecial2
-HiLink p6EscQQ           p6StringSpecial2
-HiLink p6EscQuote        p6StringSpecial2
-HiLink p6EscDoubleQuote  p6StringSpecial2
-HiLink p6EscBackTick     p6StringSpecial2
-HiLink p6EscForwardSlash p6StringSpecial2
-HiLink p6EscVerticalBar  p6StringSpecial2
-HiLink p6EscExclamation  p6StringSpecial2
-HiLink p6EscDollar       p6StringSpecial2
-HiLink p6EscOpenCurly    p6StringSpecial2
-HiLink p6EscCloseCurly   p6StringSpecial2
-HiLink p6EscCloseBracket p6StringSpecial2
-HiLink p6EscCloseAngle   p6StringSpecial2
-HiLink p6EscCloseFrench  p6StringSpecial2
-HiLink p6EscBackSlash    p6StringSpecial2
-HiLink p6RxEscape        p6StringSpecial2
-HiLink p6RxCapture       p6StringSpecial2
-HiLink p6RxAlternation   p6StringSpecial2
-HiLink p6RxP5            p6StringSpecial2
-HiLink p6RxP5ReadRef     p6StringSpecial2
-HiLink p6RxP5Oct         p6StringSpecial2
-HiLink p6RxP5Hex         p6StringSpecial2
-HiLink p6RxP5EscMeta     p6StringSpecial2
-HiLink p6RxP5Meta        p6StringSpecial2
-HiLink p6RxP5Escape      p6StringSpecial2
-HiLink p6RxP5CodePoint   p6StringSpecial2
-HiLink p6RxP5WriteRef    p6StringSpecial2
-HiLink p6RxP5Prop        p6StringSpecial2
+hi def link p6EscOctOld       p6Error
+hi def link p6PackageTwigil   p6Twigil
+hi def link p6StringAngle     p6String
+hi def link p6StringFrench    p6String
+hi def link p6StringAngles    p6String
+hi def link p6StringSQ        p6String
+hi def link p6StringDQ        p6String
+hi def link p6StringQ         p6String
+hi def link p6RxStringSQ      p6String
+hi def link p6RxStringDQ      p6String
+hi def link p6Substitution    p6String
+hi def link p6Transliteration p6String
+hi def link p6StringAuto      p6String
+hi def link p6StringP5Auto    p6String
+hi def link p6Key             p6String
+hi def link p6Match           p6String
+hi def link p6RegexBlock      p6String
+hi def link p6RxP5CharClass   p6String
+hi def link p6RxP5QuoteMeta   p6String
+hi def link p6RxCharClass     p6String
+hi def link p6RxQuoteWords    p6String
+hi def link p6ReduceOp        p6Operator
+hi def link p6ReverseCrossOp  p6Operator
+hi def link p6HyperOp         p6Operator
+hi def link p6QuoteQ          p6Operator
+hi def link p6RxRange         p6StringSpecial
+hi def link p6RxAnchor        p6StringSpecial
+hi def link p6RxP5Anchor      p6StringSpecial
+hi def link p6CodePoint       p6StringSpecial
+hi def link p6RxMeta          p6StringSpecial
+hi def link p6RxP5Range       p6StringSpecial
+hi def link p6RxP5CPId        p6StringSpecial
+hi def link p6RxP5Posix       p6StringSpecial
+hi def link p6RxP5Mod         p6StringSpecial
+hi def link p6RxP5HexSeq      p6StringSpecial
+hi def link p6RxP5OctSeq      p6StringSpecial
+hi def link p6RxP5WriteRefId  p6StringSpecial
+hi def link p6HexSequence     p6StringSpecial
+hi def link p6OctSequence     p6StringSpecial
+hi def link p6RxP5Named       p6StringSpecial
+hi def link p6RxP5PropId      p6StringSpecial
+hi def link p6RxP5Quantifier  p6StringSpecial
+hi def link p6RxP5CountId     p6StringSpecial
+hi def link p6RxP5Verb        p6StringSpecial
+hi def link p6Escape          p6StringSpecial2
+hi def link p6EscNull         p6StringSpecial2
+hi def link p6EscHash         p6StringSpecial2
+hi def link p6EscQQ           p6StringSpecial2
+hi def link p6EscQuote        p6StringSpecial2
+hi def link p6EscDoubleQuote  p6StringSpecial2
+hi def link p6EscBackTick     p6StringSpecial2
+hi def link p6EscForwardSlash p6StringSpecial2
+hi def link p6EscVerticalBar  p6StringSpecial2
+hi def link p6EscExclamation  p6StringSpecial2
+hi def link p6EscDollar       p6StringSpecial2
+hi def link p6EscOpenCurly    p6StringSpecial2
+hi def link p6EscCloseCurly   p6StringSpecial2
+hi def link p6EscCloseBracket p6StringSpecial2
+hi def link p6EscCloseAngle   p6StringSpecial2
+hi def link p6EscCloseFrench  p6StringSpecial2
+hi def link p6EscBackSlash    p6StringSpecial2
+hi def link p6RxEscape        p6StringSpecial2
+hi def link p6RxCapture       p6StringSpecial2
+hi def link p6RxAlternation   p6StringSpecial2
+hi def link p6RxP5            p6StringSpecial2
+hi def link p6RxP5ReadRef     p6StringSpecial2
+hi def link p6RxP5Oct         p6StringSpecial2
+hi def link p6RxP5Hex         p6StringSpecial2
+hi def link p6RxP5EscMeta     p6StringSpecial2
+hi def link p6RxP5Meta        p6StringSpecial2
+hi def link p6RxP5Escape      p6StringSpecial2
+hi def link p6RxP5CodePoint   p6StringSpecial2
+hi def link p6RxP5WriteRef    p6StringSpecial2
+hi def link p6RxP5Prop        p6StringSpecial2
 
-HiLink p6Property       Tag
-HiLink p6Attention      Todo
-HiLink p6Type           Type
-HiLink p6Error          Error
-HiLink p6BlockLabel     Label
-HiLink p6Float          Float
-HiLink p6Normal         Normal
-HiLink p6Package        Normal
-HiLink p6PackageScope   Normal
-HiLink p6Number         Number
-HiLink p6VersionNum     Number
-HiLink p6String         String
-HiLink p6Repeat         Repeat
-HiLink p6Keyword        Keyword
-HiLink p6Pragma         Keyword
-HiLink p6Module         Keyword
-HiLink p6DeclareRoutine Keyword
-HiLink p6VarStorage     Special
-HiLink p6FlowControl    Special
-HiLink p6NumberBase     Special
-HiLink p6Twigil         Special
-HiLink p6StringSpecial2 Special
-HiLink p6VersionDot     Special
-HiLink p6Comment        Comment
-HiLink p6Include        Include
-HiLink p6Shebang        PreProc
-HiLink p6ClosureTrait   PreProc
-HiLink p6Routine        Function
-HiLink p6Operator       Operator
-HiLink p6Version        Operator
-HiLink p6Context        Operator
-HiLink p6Quote          Delimiter
-HiLink p6TypeConstraint PreCondit
-HiLink p6Exception      Exception
-HiLink p6Placeholder    Identifier
-HiLink p6Variable       Identifier
-HiLink p6VarSlash       Identifier
-HiLink p6VarNum         Identifier
-HiLink p6VarExclam      Identifier
-HiLink p6VarMatch       Identifier
-HiLink p6VarName        Identifier
-HiLink p6MatchVar       Identifier
-HiLink p6RxP5ReadRefId  Identifier
-HiLink p6RxP5ModDef     Identifier
-HiLink p6RxP5ModName    Identifier
-HiLink p6Conditional    Conditional
-HiLink p6StringSpecial  SpecialChar
+hi def link p6Property       Tag
+hi def link p6Attention      Todo
+hi def link p6Type           Type
+hi def link p6Error          Error
+hi def link p6BlockLabel     Label
+hi def link p6Float          Float
+hi def link p6Normal         Normal
+hi def link p6Package        Normal
+hi def link p6PackageScope   Normal
+hi def link p6Number         Number
+hi def link p6VersionNum     Number
+hi def link p6String         String
+hi def link p6Repeat         Repeat
+hi def link p6Keyword        Keyword
+hi def link p6Pragma         Keyword
+hi def link p6Module         Keyword
+hi def link p6DeclareRoutine Keyword
+hi def link p6VarStorage     Special
+hi def link p6FlowControl    Special
+hi def link p6NumberBase     Special
+hi def link p6Twigil         Special
+hi def link p6StringSpecial2 Special
+hi def link p6VersionDot     Special
+hi def link p6Comment        Comment
+hi def link p6Include        Include
+hi def link p6Shebang        PreProc
+hi def link p6ClosureTrait   PreProc
+hi def link p6Routine        Function
+hi def link p6Operator       Operator
+hi def link p6Version        Operator
+hi def link p6Context        Operator
+hi def link p6Quote          Delimiter
+hi def link p6TypeConstraint PreCondit
+hi def link p6Exception      Exception
+hi def link p6Placeholder    Identifier
+hi def link p6Variable       Identifier
+hi def link p6VarSlash       Identifier
+hi def link p6VarNum         Identifier
+hi def link p6VarExclam      Identifier
+hi def link p6VarMatch       Identifier
+hi def link p6VarName        Identifier
+hi def link p6MatchVar       Identifier
+hi def link p6RxP5ReadRefId  Identifier
+hi def link p6RxP5ModDef     Identifier
+hi def link p6RxP5ModName    Identifier
+hi def link p6Conditional    Conditional
+hi def link p6StringSpecial  SpecialChar
 
-HiLink p6PodAbbr         p6Pod
-HiLink p6PodAbbrEOF      p6Pod
-HiLink p6PodAbbrNoCode   p6Pod
-HiLink p6PodAbbrCode     p6PodCode
-HiLink p6PodPara         p6Pod
-HiLink p6PodParaEOF      p6Pod
-HiLink p6PodParaNoCode   p6Pod
-HiLink p6PodParaCode     p6PodCode
-HiLink p6PodDelim        p6Pod
-HiLink p6PodDelimEOF     p6Pod
-HiLink p6PodDelimNoCode  p6Pod
-HiLink p6PodDelimCode    p6PodCode
-HiLink p6PodImplicitCode p6PodCode
-HiLink p6PodExtraConfig  p6PodPrefix
-HiLink p6PodVerticalBar  p6PodFormatCode
-HiLink p6PodColon        p6PodFormatCode
-HiLink p6PodSemicolon    p6PodFormatCode
-HiLink p6PodComma        p6PodFormatCode
-HiLink p6PodFormatOne    p6PodFormat
-HiLink p6PodFormatTwo    p6PodFormat
-HiLink p6PodFormatThree  p6PodFormat
-HiLink p6PodFormatFrench p6PodFormat
+hi def link p6PodAbbr         p6Pod
+hi def link p6PodAbbrEOF      p6Pod
+hi def link p6PodAbbrNoCode   p6Pod
+hi def link p6PodAbbrCode     p6PodCode
+hi def link p6PodPara         p6Pod
+hi def link p6PodParaEOF      p6Pod
+hi def link p6PodParaNoCode   p6Pod
+hi def link p6PodParaCode     p6PodCode
+hi def link p6PodDelim        p6Pod
+hi def link p6PodDelimEOF     p6Pod
+hi def link p6PodDelimNoCode  p6Pod
+hi def link p6PodDelimCode    p6PodCode
+hi def link p6PodImplicitCode p6PodCode
+hi def link p6PodExtraConfig  p6PodPrefix
+hi def link p6PodVerticalBar  p6PodFormatCode
+hi def link p6PodColon        p6PodFormatCode
+hi def link p6PodSemicolon    p6PodFormatCode
+hi def link p6PodComma        p6PodFormatCode
+hi def link p6PodFormatOne    p6PodFormat
+hi def link p6PodFormatTwo    p6PodFormat
+hi def link p6PodFormatThree  p6PodFormat
+hi def link p6PodFormatFrench p6PodFormat
 
-HiLink p6PodType           Type
-HiLink p6PodConfigOption   String
-HiLink p6PodCode           PreProc
-HiLink p6Pod               Comment
-HiLink p6PodComment        Comment
-HiLink p6PodAutoQuote      Operator
-HiLink p6PodConfigOperator Operator
-HiLink p6PodPrefix         Statement
-HiLink p6PodName           Identifier
-HiLink p6PodFormatCode     SpecialChar
-HiLink p6PodFormat         SpecialComment
+hi def link p6PodType           Type
+hi def link p6PodConfigOption   String
+hi def link p6PodCode           PreProc
+hi def link p6Pod               Comment
+hi def link p6PodComment        Comment
+hi def link p6PodAutoQuote      Operator
+hi def link p6PodConfigOperator Operator
+hi def link p6PodPrefix         Statement
+hi def link p6PodName           Identifier
+hi def link p6PodFormatCode     SpecialChar
+hi def link p6PodFormat         SpecialComment
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "syn sync match p6SyncPod groupthere p6PodAbbrRegion     "^=\K\k*\>"
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -1811,26 +1811,24 @@ syntax match pfmainSpecial	"\<smtpd\>"
 syntax match pfmainSpecial	"\<trace\>"
 syntax match pfmainSpecial	"\<verify\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pfmainConf	Statement
-HiLink pfmainRef	PreProc
-HiLink pfmainWord	identifier
+hi def link pfmainConf	Statement
+hi def link pfmainRef	PreProc
+hi def link pfmainWord	identifier
 
-HiLink pfmainDict	Type
-HiLink pfmainQueueDir	Constant
-HiLink pfmainTransport	Constant
-HiLink pfmainLock	Constant
-HiLink pfmainAnswer	Constant
+hi def link pfmainDict	Type
+hi def link pfmainQueueDir	Constant
+hi def link pfmainTransport	Constant
+hi def link pfmainLock	Constant
+hi def link pfmainAnswer	Constant
 
-HiLink pfmainComment	Comment
-HiLink pfmainNumber	Number
-HiLink pfmainTime	Number
-HiLink pfmainIP		Number
-HiLink pfmainVariable	Error
-HiLink pfmainSpecial	Special
+hi def link pfmainComment	Comment
+hi def link pfmainNumber	Number
+hi def link pfmainTime	Number
+hi def link pfmainIP		Number
+hi def link pfmainVariable	Error
+hi def link pfmainSpecial	Special
 
-delcommand HiLink
 
 let b:current_syntax = "pfmain"
 
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -598,53 +598,52 @@ syntax match  phpDocTodo  "@\(todo\|fixm
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink   phpConstant  Constant
-HiLink   phpCoreConstant  Constant
-HiLink   phpComment Comment
-HiLink   phpDocTags PreProc
-HiLink   phpDocCustomTags Type
-HiLink   phpException Exception
-HiLink   phpBoolean Boolean
-HiLink   phpStorageClass  StorageClass
-HiLink   phpSCKeyword StorageClass
-HiLink   phpFCKeyword Define
-HiLink   phpStructure Structure
-HiLink   phpStringSingle  String
-HiLink   phpStringDouble  String
-HiLink   phpBacktick  String
-HiLink   phpNumber  Number
-HiLink   phpFloat Float
-HiLink   phpMethods Function
-HiLink   phpFunctions Function
-HiLink   phpBaselib Function
-HiLink   phpRepeat  Repeat
-HiLink   phpConditional Conditional
-HiLink   phpLabel Label
-HiLink   phpStatement Statement
-HiLink   phpKeyword Statement
-HiLink   phpType  Type
-HiLink   phpInclude Include
-HiLink   phpDefine  Define
-HiLink   phpBackslashSequences SpecialChar
-HiLink   phpBackslashDoubleQuote SpecialChar
-HiLink   phpBackslashSingleQuote SpecialChar
-HiLink   phpParent  Delimiter
-HiLink   phpBrackets  Delimiter
-HiLink   phpIdentifierConst Delimiter
-HiLink   phpParentError Error
-HiLink   phpOctalError  Error
-HiLink   phpInterpSimpleError Error
-HiLink   phpInterpBogusDollarCurley Error
-HiLink   phpInterpDollarCurly1 Error
-HiLink   phpInterpDollarCurly2 Error
-HiLink   phpInterpSimpleBracketsInner String
-HiLink   phpInterpSimpleCurly Delimiter
-HiLink   phpInterpVarname Identifier
-HiLink   phpTodo  Todo
-HiLink   phpDocTodo Todo
-HiLink   phpMemberSelector  Structure
+hi def link phpConstant  Constant
+hi def link phpCoreConstant  Constant
+hi def link phpComment Comment
+hi def link phpDocTags PreProc
+hi def link phpDocCustomTags Type
+hi def link phpException Exception
+hi def link phpBoolean Boolean
+hi def link phpStorageClass  StorageClass
+hi def link phpSCKeyword StorageClass
+hi def link phpFCKeyword Define
+hi def link phpStructure Structure
+hi def link phpStringSingle  String
+hi def link phpStringDouble  String
+hi def link phpBacktick  String
+hi def link phpNumber  Number
+hi def link phpFloat Float
+hi def link phpMethods Function
+hi def link phpFunctions Function
+hi def link phpBaselib Function
+hi def link phpRepeat  Repeat
+hi def link phpConditional Conditional
+hi def link phpLabel Label
+hi def link phpStatement Statement
+hi def link phpKeyword Statement
+hi def link phpType  Type
+hi def link phpInclude Include
+hi def link phpDefine  Define
+hi def link phpBackslashSequences SpecialChar
+hi def link phpBackslashDoubleQuote SpecialChar
+hi def link phpBackslashSingleQuote SpecialChar
+hi def link phpParent  Delimiter
+hi def link phpBrackets  Delimiter
+hi def link phpIdentifierConst Delimiter
+hi def link phpParentError Error
+hi def link phpOctalError  Error
+hi def link phpInterpSimpleError Error
+hi def link phpInterpBogusDollarCurley Error
+hi def link phpInterpDollarCurly1 Error
+hi def link phpInterpDollarCurly2 Error
+hi def link phpInterpSimpleBracketsInner String
+hi def link phpInterpSimpleCurly Delimiter
+hi def link phpInterpVarname Identifier
+hi def link phpTodo  Todo
+hi def link phpDocTodo Todo
+hi def link phpMemberSelector  Structure
 if exists("php_oldStyle")
 hi  phpIntVar guifg=Red ctermfg=DarkRed
 hi  phpEnvVar guifg=Red ctermfg=DarkRed
@@ -654,16 +653,15 @@ hi  phpRelation guifg=SeaGreen ctermfg=D
 hi  phpIdentifier guifg=DarkGray ctermfg=Brown
 hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
 else
-HiLink   phpIntVar Identifier
-HiLink   phpEnvVar Identifier
-HiLink   phpOperator Operator
-HiLink   phpVarSelector  Operator
-HiLink   phpRelation Operator
-HiLink   phpIdentifier Identifier
-HiLink   phpIdentifierSimply Identifier
+hi def link phpIntVar Identifier
+hi def link phpEnvVar Identifier
+hi def link phpOperator Operator
+hi def link phpVarSelector  Operator
+hi def link phpRelation Operator
+hi def link phpIdentifier Identifier
+hi def link phpIdentifierSimply Identifier
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "php"
 
diff --git a/runtime/syntax/pic.vim b/runtime/syntax/pic.vim
--- a/runtime/syntax/pic.vim
+++ b/runtime/syntax/pic.vim
@@ -89,27 +89,25 @@ syn match picDirective   "#\=DEFINE"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
 
-"HiLink picOpcode		Keyword
-"HiLink picRegister		Structure
-"HiLink picRegisterPart	Special
+"hi def link picOpcode		Keyword
+"hi def link picRegister		Structure
+"hi def link picRegisterPart	Special
 
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
 
-HiLink picIdentifier		Identifier
+hi def link picIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "pic"
 
diff --git a/runtime/syntax/pike.vim b/runtime/syntax/pike.vim
--- a/runtime/syntax/pike.vim
+++ b/runtime/syntax/pike.vim
@@ -102,42 +102,40 @@ syn sync ccomment pikeComment minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pikeLabel		Label
-HiLink pikeUserLabel		Label
-HiLink pikeConditional	Conditional
-HiLink pikeRepeat		Repeat
-HiLink pikeCharacter		Character
-HiLink pikeSpecialCharacter pikeSpecial
-HiLink pikeNumber		Number
-HiLink pikeFloat		Float
-HiLink pikeOctalError		pikeError
-HiLink pikeParenError		pikeError
-HiLink pikeInParen		pikeError
-HiLink pikeCommentError	pikeError
-HiLink pikeOperator		Operator
-HiLink pikeInclude		Include
-HiLink pikePreProc		PreProc
-HiLink pikeDefine		Macro
-HiLink pikeIncluded		pikeString
-HiLink pikeError		Error
-HiLink pikeStatement		Statement
-HiLink pikePreCondit		PreCondit
-HiLink pikeType		Type
-HiLink pikeCommentError	pikeError
-HiLink pikeCommentString	pikeString
-HiLink pikeComment2String	pikeString
-HiLink pikeCommentSkip	pikeComment
-HiLink pikeString		String
-HiLink pikeComment		Comment
-HiLink pikeSpecial		SpecialChar
-HiLink pikeTodo		Todo
-HiLink pikeException		pikeStatement
-HiLink pikeCompoundType	Constant
-"HiLink pikeIdentifier	Identifier
+hi def link pikeLabel		Label
+hi def link pikeUserLabel		Label
+hi def link pikeConditional	Conditional
+hi def link pikeRepeat		Repeat
+hi def link pikeCharacter		Character
+hi def link pikeSpecialCharacter pikeSpecial
+hi def link pikeNumber		Number
+hi def link pikeFloat		Float
+hi def link pikeOctalError		pikeError
+hi def link pikeParenError		pikeError
+hi def link pikeInParen		pikeError
+hi def link pikeCommentError	pikeError
+hi def link pikeOperator		Operator
+hi def link pikeInclude		Include
+hi def link pikePreProc		PreProc
+hi def link pikeDefine		Macro
+hi def link pikeIncluded		pikeString
+hi def link pikeError		Error
+hi def link pikeStatement		Statement
+hi def link pikePreCondit		PreCondit
+hi def link pikeType		Type
+hi def link pikeCommentError	pikeError
+hi def link pikeCommentString	pikeString
+hi def link pikeComment2String	pikeString
+hi def link pikeCommentSkip	pikeComment
+hi def link pikeString		String
+hi def link pikeComment		Comment
+hi def link pikeSpecial		SpecialChar
+hi def link pikeTodo		Todo
+hi def link pikeException		pikeStatement
+hi def link pikeCompoundType	Constant
+"hi def link pikeIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "pike"
 
diff --git a/runtime/syntax/pilrc.vim b/runtime/syntax/pilrc.vim
--- a/runtime/syntax/pilrc.vim
+++ b/runtime/syntax/pilrc.vim
@@ -117,22 +117,20 @@ syn region pilrcInclude start="public cl
 
 syn sync ccomment pilrcComment
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting
-HiLink pilrcKeyword		Statement
-HiLink pilrcType		Type
-HiLink pilrcError		Error
-HiLink pilrcCountry		SpecialChar
-HiLink pilrcLanguage		SpecialChar
-HiLink pilrcString		SpecialChar
-HiLink pilrcNumber		Number
-HiLink pilrcComment		Comment
-HiLink pilrcConstant		Constant
-HiLink pilrcFunction		Function
-HiLink pilrcInclude		SpecialChar
-HiLink pilrcIdentifier		Number
+hi def link pilrcKeyword		Statement
+hi def link pilrcType		Type
+hi def link pilrcError		Error
+hi def link pilrcCountry		SpecialChar
+hi def link pilrcLanguage		SpecialChar
+hi def link pilrcString		SpecialChar
+hi def link pilrcNumber		Number
+hi def link pilrcComment		Comment
+hi def link pilrcConstant		Constant
+hi def link pilrcFunction		Function
+hi def link pilrcInclude		SpecialChar
+hi def link pilrcIdentifier		Number
 
-delcommand HiLink
 
 let b:current_syntax = "pilrc"
diff --git a/runtime/syntax/pine.vim b/runtime/syntax/pine.vim
--- a/runtime/syntax/pine.vim
+++ b/runtime/syntax/pine.vim
@@ -345,12 +345,10 @@ syn match  pineComment  "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pineConfig	Type
-HiLink pineComment	Comment
-HiLink pineOption	Macro
-delcommand HiLink
+hi def link pineConfig	Type
+hi def link pineComment	Comment
+hi def link pineOption	Macro
 
 let b:current_syntax = "pine"
 
diff --git a/runtime/syntax/pli.vim b/runtime/syntax/pli.vim
--- a/runtime/syntax/pli.vim
+++ b/runtime/syntax/pli.vim
@@ -222,47 +222,45 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pl1Attribute       Macro
-HiLink pl1BlockError      Error
-HiLink pl1BooleanLiteral  Boolean
-HiLink pl1CharLiteral     Character
-HiLink pl1Comment         Comment
-HiLink pl1CommentL        Comment
-HiLink pl1Conditional     Conditional
-HiLink pl1Error           Error
-HiLink pl1ErrInBracket    Error
-HiLink pl1ErrInBlock      Error
-HiLink pl1ErrInParen      Error
-HiLink pl1Exception       Function
-HiLink pl1FloatLiteral    Float
-HiLink pl1Function        Function
-HiLink pl1Garbage         Error
-HiLink pl1HostIdentifier  Label
-HiLink pl1Identifier      Normal
-HiLink pl1IntLiteral      Number
-HiLink pl1Operator        Operator
-HiLink pl1Paren           Normal
-HiLink pl1ParenError      Error
-HiLink pl1SpaceError      Error
-HiLink pl1Pseudo          PreProc
-HiLink pl1PreProc         PreProc
-HiLink pl1PreProcSym      PreProc
-HiLink pl1Keyword         Keyword
-HiLink pl1Other           Keyword
-HiLink pl1Repeat          Repeat
-HiLink pl1Statement       Keyword
-HiLink pl1Storage         StorageClass
-HiLink pl1StringError     Error
-HiLink pl1StringLiteral   String
-HiLink pl1CommentString   String
-HiLink pl1Comment2String  String
-HiLink pl1Symbol          Normal
-HiLink pl1Trigger         Function
-HiLink pl1TypeAttribute   StorageClass
-HiLink pl1Todo            Todo
+hi def link pl1Attribute       Macro
+hi def link pl1BlockError      Error
+hi def link pl1BooleanLiteral  Boolean
+hi def link pl1CharLiteral     Character
+hi def link pl1Comment         Comment
+hi def link pl1CommentL        Comment
+hi def link pl1Conditional     Conditional
+hi def link pl1Error           Error
+hi def link pl1ErrInBracket    Error
+hi def link pl1ErrInBlock      Error
+hi def link pl1ErrInParen      Error
+hi def link pl1Exception       Function
+hi def link pl1FloatLiteral    Float
+hi def link pl1Function        Function
+hi def link pl1Garbage         Error
+hi def link pl1HostIdentifier  Label
+hi def link pl1Identifier      Normal
+hi def link pl1IntLiteral      Number
+hi def link pl1Operator        Operator
+hi def link pl1Paren           Normal
+hi def link pl1ParenError      Error
+hi def link pl1SpaceError      Error
+hi def link pl1Pseudo          PreProc
+hi def link pl1PreProc         PreProc
+hi def link pl1PreProcSym      PreProc
+hi def link pl1Keyword         Keyword
+hi def link pl1Other           Keyword
+hi def link pl1Repeat          Repeat
+hi def link pl1Statement       Keyword
+hi def link pl1Storage         StorageClass
+hi def link pl1StringError     Error
+hi def link pl1StringLiteral   String
+hi def link pl1CommentString   String
+hi def link pl1Comment2String  String
+hi def link pl1Symbol          Normal
+hi def link pl1Trigger         Function
+hi def link pl1TypeAttribute   StorageClass
+hi def link pl1Todo            Todo
 
-delcommand HiLink
 
 let b:current_syntax = "pl1"
diff --git a/runtime/syntax/plm.vim b/runtime/syntax/plm.vim
--- a/runtime/syntax/plm.vim
+++ b/runtime/syntax/plm.vim
@@ -101,34 +101,32 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-"  HiLink plmLabel			Label
-"  HiLink plmConditional		Conditional
-"  HiLink plmRepeat			Repeat
-HiLink plmTodo			Todo
-HiLink plmNumber			Number
-HiLink plmOperator			Operator
-HiLink plmDelimiter			Operator
-"HiLink plmShowTab			Error
-"HiLink plmShowTabc			Error
-HiLink plmIdentifier			Identifier
-HiLink plmBuiltIn			Statement
-HiLink plm286BuiltIn			Statement
-HiLink plm386BuiltIn			Statement
-HiLink plm386w16BuiltIn		Statement
-HiLink plmReserved			Statement
-HiLink plm386Reserved			Statement
-HiLink plmPreProc			PreProc
-HiLink plmCommentError		plmError
-HiLink plmCommentString		plmString
-HiLink plmComment2String		plmString
-HiLink plmCommentSkip			plmComment
-HiLink plmString			String
-HiLink plmComment			Comment
+"  hi def link plmLabel			Label
+"  hi def link plmConditional		Conditional
+"  hi def link plmRepeat			Repeat
+hi def link plmTodo			Todo
+hi def link plmNumber			Number
+hi def link plmOperator			Operator
+hi def link plmDelimiter			Operator
+"hi def link plmShowTab			Error
+"hi def link plmShowTabc			Error
+hi def link plmIdentifier			Identifier
+hi def link plmBuiltIn			Statement
+hi def link plm286BuiltIn			Statement
+hi def link plm386BuiltIn			Statement
+hi def link plm386w16BuiltIn		Statement
+hi def link plmReserved			Statement
+hi def link plm386Reserved			Statement
+hi def link plmPreProc			PreProc
+hi def link plmCommentError		plmError
+hi def link plmCommentString		plmString
+hi def link plmComment2String		plmString
+hi def link plmCommentSkip			plmComment
+hi def link plmString			String
+hi def link plmComment			Comment
 
-delcommand HiLink
 
 let b:current_syntax = "plm"
 
diff --git a/runtime/syntax/plsql.vim b/runtime/syntax/plsql.vim
--- a/runtime/syntax/plsql.vim
+++ b/runtime/syntax/plsql.vim
@@ -221,45 +221,43 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink plsqlAttribute		Macro
-HiLink plsqlBlockError	Error
-HiLink plsqlBooleanLiteral	Boolean
-HiLink plsqlCharLiteral	Character
-HiLink plsqlComment		Comment
-HiLink plsqlCommentL		Comment
-HiLink plsqlConditional	Conditional
-HiLink plsqlError		Error
-HiLink plsqlErrInBracket	Error
-HiLink plsqlErrInBlock	Error
-HiLink plsqlErrInParen	Error
-HiLink plsqlException		Function
-HiLink plsqlFloatLiteral	Float
-HiLink plsqlFunction		Function
-HiLink plsqlGarbage		Error
-HiLink plsqlHostIdentifier	Label
-HiLink plsqlIdentifier	Normal
-HiLink plsqlIntLiteral	Number
-HiLink plsqlOperator		Operator
-HiLink plsqlParen		Normal
-HiLink plsqlParenError	Error
-HiLink plsqlSpaceError	Error
-HiLink plsqlPseudo		PreProc
-HiLink plsqlKeyword		Keyword
-HiLink plsqlRepeat		Repeat
-HiLink plsqlStorage		StorageClass
-HiLink plsqlSQLKeyword	Function
-HiLink plsqlStringError	Error
-HiLink plsqlStringLiteral	String
-HiLink plsqlCommentString	String
-HiLink plsqlComment2String	String
-HiLink plsqlSymbol		Normal
-HiLink plsqlTrigger		Function
-HiLink plsqlTypeAttribute	StorageClass
-HiLink plsqlTodo		Todo
+hi def link plsqlAttribute		Macro
+hi def link plsqlBlockError	Error
+hi def link plsqlBooleanLiteral	Boolean
+hi def link plsqlCharLiteral	Character
+hi def link plsqlComment		Comment
+hi def link plsqlCommentL		Comment
+hi def link plsqlConditional	Conditional
+hi def link plsqlError		Error
+hi def link plsqlErrInBracket	Error
+hi def link plsqlErrInBlock	Error
+hi def link plsqlErrInParen	Error
+hi def link plsqlException		Function
+hi def link plsqlFloatLiteral	Float
+hi def link plsqlFunction		Function
+hi def link plsqlGarbage		Error
+hi def link plsqlHostIdentifier	Label
+hi def link plsqlIdentifier	Normal
+hi def link plsqlIntLiteral	Number
+hi def link plsqlOperator		Operator
+hi def link plsqlParen		Normal
+hi def link plsqlParenError	Error
+hi def link plsqlSpaceError	Error
+hi def link plsqlPseudo		PreProc
+hi def link plsqlKeyword		Keyword
+hi def link plsqlRepeat		Repeat
+hi def link plsqlStorage		StorageClass
+hi def link plsqlSQLKeyword	Function
+hi def link plsqlStringError	Error
+hi def link plsqlStringLiteral	String
+hi def link plsqlCommentString	String
+hi def link plsqlComment2String	String
+hi def link plsqlSymbol		Normal
+hi def link plsqlTrigger		Function
+hi def link plsqlTypeAttribute	StorageClass
+hi def link plsqlTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "plsql"
 
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -80,52 +80,50 @@ syn match poVariable contained "%\d"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink poCommentSources    PreProc
-HiLink poComment	     Comment
-HiLink poCommentAutomatic  Comment
-HiLink poCommentTranslator Comment
-HiLink poCommentFlags      Special
-HiLink poCommentDiff       Comment
-HiLink poCopyrightUnset    Todo
-HiLink poFlagFuzzy         Todo
-HiLink poDiffOld           Todo
-HiLink poDiffNew          Special
-HiLink poObsolete         Comment
+hi def link poCommentSources    PreProc
+hi def link poComment	     Comment
+hi def link poCommentAutomatic  Comment
+hi def link poCommentTranslator Comment
+hi def link poCommentFlags      Special
+hi def link poCommentDiff       Comment
+hi def link poCopyrightUnset    Todo
+hi def link poFlagFuzzy         Todo
+hi def link poDiffOld           Todo
+hi def link poDiffNew          Special
+hi def link poObsolete         Comment
 
-HiLink poStatementMsgid   Statement
-HiLink poStatementMsgstr  Statement
-HiLink poStatementMsgidplural  Statement
-HiLink poStatementMsgCTxt Statement
-HiLink poPluralCaseN      Constant
+hi def link poStatementMsgid   Statement
+hi def link poStatementMsgstr  Statement
+hi def link poStatementMsgidplural  Statement
+hi def link poStatementMsgCTxt Statement
+hi def link poPluralCaseN      Constant
 
-HiLink poStringCTxt	    Comment
-HiLink poStringID	    String
-HiLink poStringSTR	    String
-HiLink poCommentKDE       Comment
-HiLink poCommentKDEError  Error
-HiLink poPluralKDE        Comment
-HiLink poPluralKDEError   Error
-HiLink poHeaderItem       Identifier
-HiLink poHeaderUndefined  Todo
-HiLink poKDEdesktopFile   Identifier
+hi def link poStringCTxt	    Comment
+hi def link poStringID	    String
+hi def link poStringSTR	    String
+hi def link poCommentKDE       Comment
+hi def link poCommentKDEError  Error
+hi def link poPluralKDE        Comment
+hi def link poPluralKDEError   Error
+hi def link poHeaderItem       Identifier
+hi def link poHeaderUndefined  Todo
+hi def link poKDEdesktopFile   Identifier
 
-HiLink poHtml              Identifier
-HiLink poHtmlNot           String
-HiLink poHtmlTranslatables String
-HiLink poLineBreak         String
+hi def link poHtml              Identifier
+hi def link poHtmlNot           String
+hi def link poHtmlTranslatables String
+hi def link poLineBreak         String
 
-HiLink poFormat	    poSpecial
-HiLink poSpecial	    Special
-HiLink poAcceleratorId    Special
-HiLink poAcceleratorStr   Special
-HiLink poVariable         Special
+hi def link poFormat	    poSpecial
+hi def link poSpecial	    Special
+hi def link poAcceleratorId    Special
+hi def link poAcceleratorStr   Special
+hi def link poVariable         Special
 
-HiLink poMsguniqError        Special
-HiLink poMsguniqErrorMarkers Comment
+hi def link poMsguniqError        Special
+hi def link poMsguniqErrorMarkers Comment
 
-delcommand HiLink
 
 let b:current_syntax = "po"
 
diff --git a/runtime/syntax/pod.vim b/runtime/syntax/pod.vim
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -65,19 +65,17 @@ syn match  podEscape2	"\d\+>"me=e-1 cont
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink podCommand		Statement
-HiLink podCmdText		String
-HiLink podOverIndent		Number
-HiLink podForKeywd		Identifier
-HiLink podFormat		Identifier
-HiLink podVerbatimLine	PreProc
-HiLink podSpecial		Identifier
-HiLink podEscape		String
-HiLink podEscape2		Number
+hi def link podCommand		Statement
+hi def link podCmdText		String
+hi def link podOverIndent		Number
+hi def link podForKeywd		Identifier
+hi def link podFormat		Identifier
+hi def link podVerbatimLine	PreProc
+hi def link podSpecial		Identifier
+hi def link podEscape		String
+hi def link podEscape2		Number
 
-delcommand HiLink
 
 if exists("perl_pod_spellcheck_headings")
   " Spell-check headings
diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim
--- a/runtime/syntax/postscr.vim
+++ b/runtime/syntax/postscr.vim
@@ -724,58 +724,56 @@ endif " GhostScript highlighting
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink postscrComment         Comment
+hi def link postscrComment         Comment
 
-HiLink postscrConstant        Constant
-HiLink postscrString          String
-HiLink postscrASCIIString     postscrString
-HiLink postscrHexString       postscrString
-HiLink postscrASCII85String   postscrString
-HiLink postscrNumber          Number
-HiLink postscrInteger         postscrNumber
-HiLink postscrHex             postscrNumber
-HiLink postscrRadix           postscrNumber
-HiLink postscrFloat           Float
-HiLink postscrBoolean         Boolean
+hi def link postscrConstant        Constant
+hi def link postscrString          String
+hi def link postscrASCIIString     postscrString
+hi def link postscrHexString       postscrString
+hi def link postscrASCII85String   postscrString
+hi def link postscrNumber          Number
+hi def link postscrInteger         postscrNumber
+hi def link postscrHex             postscrNumber
+hi def link postscrRadix           postscrNumber
+hi def link postscrFloat           Float
+hi def link postscrBoolean         Boolean
 
-HiLink postscrIdentifier      Identifier
-HiLink postscrProcedure       Function
+hi def link postscrIdentifier      Identifier
+hi def link postscrProcedure       Function
 
-HiLink postscrName            Statement
-HiLink postscrConditional     Conditional
-HiLink postscrRepeat          Repeat
-HiLink postscrL2Repeat        postscrRepeat
-HiLink postscrOperator        Operator
-HiLink postscrL1Operator      postscrOperator
-HiLink postscrL2Operator      postscrOperator
-HiLink postscrL3Operator      postscrOperator
-HiLink postscrMathOperator    postscrOperator
-HiLink postscrLogicalOperator postscrOperator
-HiLink postscrBinaryOperator  postscrOperator
+hi def link postscrName            Statement
+hi def link postscrConditional     Conditional
+hi def link postscrRepeat          Repeat
+hi def link postscrL2Repeat        postscrRepeat
+hi def link postscrOperator        Operator
+hi def link postscrL1Operator      postscrOperator
+hi def link postscrL2Operator      postscrOperator
+hi def link postscrL3Operator      postscrOperator
+hi def link postscrMathOperator    postscrOperator
+hi def link postscrLogicalOperator postscrOperator
+hi def link postscrBinaryOperator  postscrOperator
 
-HiLink postscrDSCComment      SpecialComment
-HiLink postscrSpecialChar     SpecialChar
+hi def link postscrDSCComment      SpecialComment
+hi def link postscrSpecialChar     SpecialChar
 
-HiLink postscrTodo            Todo
+hi def link postscrTodo            Todo
 
-HiLink postscrError           Error
-HiLink postscrSpecialCharError postscrError
-HiLink postscrASCII85CharError postscrError
-HiLink postscrHexCharError    postscrError
-HiLink postscrASCIIStringError postscrError
-HiLink postscrIdentifierError postscrError
+hi def link postscrError           Error
+hi def link postscrSpecialCharError postscrError
+hi def link postscrASCII85CharError postscrError
+hi def link postscrHexCharError    postscrError
+hi def link postscrASCIIStringError postscrError
+hi def link postscrIdentifierError postscrError
 
 if exists("postscr_ghostscript")
-HiLink postscrGSOperator      postscrOperator
-HiLink postscrGSMathOperator  postscrMathOperator
+hi def link postscrGSOperator      postscrOperator
+hi def link postscrGSMathOperator  postscrMathOperator
 else
-HiLink postscrGSOperator      postscrError
-HiLink postscrGSMathOperator  postscrError
+hi def link postscrGSOperator      postscrError
+hi def link postscrGSMathOperator  postscrError
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "postscr"
 
diff --git a/runtime/syntax/ppd.vim b/runtime/syntax/ppd.vim
--- a/runtime/syntax/ppd.vim
+++ b/runtime/syntax/ppd.vim
@@ -19,18 +19,16 @@ syn match	ppdContraints	"^*UIConstraints
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink ppdComment		Comment
-HiLink ppdDefine		Statement
-HiLink ppdUI			Function
-HiLink ppdUIGroup		Function
-HiLink ppdDef			String
-HiLink ppdGUIText		Type
-HiLink ppdContraints		Special
+hi def link ppdComment		Comment
+hi def link ppdDefine		Statement
+hi def link ppdUI			Function
+hi def link ppdUIGroup		Function
+hi def link ppdDef			String
+hi def link ppdGUIText		Type
+hi def link ppdContraints		Special
 
-delcommand HiLink
 
 let b:current_syntax = "ppd"
 
diff --git a/runtime/syntax/ppwiz.vim b/runtime/syntax/ppwiz.vim
--- a/runtime/syntax/ppwiz.vim
+++ b/runtime/syntax/ppwiz.vim
@@ -61,24 +61,22 @@ syn cluster ppwizArgVal add=ppwizString,
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ppwizSpecial  Special
-HiLink ppwizEqual    ppwizSpecial
-HiLink ppwizOperator ppwizSpecial
-HiLink ppwizComment  Comment
-HiLink ppwizDef      PreProc
-HiLink ppwizMacro    Statement
-HiLink ppwizArg      Identifier
-HiLink ppwizStdVar   Identifier
-HiLink ppwizRexxVar  Identifier
-HiLink ppwizString   Constant
-HiLink ppwizInteger  Constant
-HiLink ppwizCont     ppwizSpecial
-HiLink ppwizError    Error
-HiLink ppwizHTML     Type
+hi def link ppwizSpecial  Special
+hi def link ppwizEqual    ppwizSpecial
+hi def link ppwizOperator ppwizSpecial
+hi def link ppwizComment  Comment
+hi def link ppwizDef      PreProc
+hi def link ppwizMacro    Statement
+hi def link ppwizArg      Identifier
+hi def link ppwizStdVar   Identifier
+hi def link ppwizRexxVar  Identifier
+hi def link ppwizString   Constant
+hi def link ppwizInteger  Constant
+hi def link ppwizCont     ppwizSpecial
+hi def link ppwizError    Error
+hi def link ppwizHTML     Type
 
-delcommand HiLink
 
 let b:current_syntax = "ppwiz"
 
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
--- a/runtime/syntax/prescribe.vim
+++ b/runtime/syntax/prescribe.vim
@@ -42,16 +42,14 @@ syn region  prescribeComment	start=+CMNT
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink prescribeSpecial		PreProc
-HiLink prescribeStatement		Statement
-HiLink prescribeNumber		Number
-HiLink prescribeCSETArg		String
-HiLink prescribeFRPOArg		String
-HiLink prescribeComment		Comment
+hi def link prescribeSpecial		PreProc
+hi def link prescribeStatement		Statement
+hi def link prescribeNumber		Number
+hi def link prescribeCSETArg		String
+hi def link prescribeFRPOArg		String
+hi def link prescribeComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "prescribe"
 
diff --git a/runtime/syntax/procmail.vim b/runtime/syntax/procmail.vim
--- a/runtime/syntax/procmail.vim
+++ b/runtime/syntax/procmail.vim
@@ -31,25 +31,23 @@ syn region procmailRecipe start=+^\s*:.*
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink procmailComment Comment
-HiLink procmailTodo    Todo
+hi def link procmailComment Comment
+hi def link procmailTodo    Todo
 
-HiLink procmailRecipe   Statement
-"HiLink procmailCondition   Statement
+hi def link procmailRecipe   Statement
+"hi def link procmailCondition   Statement
 
-HiLink procmailActionFolder	procmailAction
-HiLink procmailActionVariable procmailAction
-HiLink procmailActionForward	procmailAction
-HiLink procmailActionPipe	procmailAction
-HiLink procmailAction		Function
-HiLink procmailVar		Identifier
-HiLink procmailVarDecl	Identifier
+hi def link procmailActionFolder	procmailAction
+hi def link procmailActionVariable procmailAction
+hi def link procmailActionForward	procmailAction
+hi def link procmailActionPipe	procmailAction
+hi def link procmailAction		Function
+hi def link procmailVar		Identifier
+hi def link procmailVarDecl	Identifier
 
-HiLink procmailString String
+hi def link procmailString String
 
-delcommand HiLink
 
 let b:current_syntax = "procmail"
 
diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim
--- a/runtime/syntax/progress.vim
+++ b/runtime/syntax/progress.vim
@@ -276,35 +276,33 @@ syn sync lines=800
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink ProgressByte		Number
-HiLink ProgressCase		Repeat
-HiLink ProgressComment		Comment
-HiLink ProgressConditional	Conditional
-HiLink ProgressDebug		Debug
-HiLink ProgressDo		Repeat
-HiLink ProgressEndError		Error
-HiLink ProgressFor		Repeat
-HiLink ProgressFunction		Procedure
-HiLink ProgressIdentifier	Identifier
-HiLink ProgressInclude		Include
-HiLink ProgressMatrixDelimiter	Identifier
-HiLink ProgressNumber		Number
-HiLink ProgressOperator		Operator
-HiLink ProgressPreProc		PreProc
-HiLink ProgressProcedure	Procedure
-HiLink ProgressQuote		Delimiter
-HiLink ProgressRepeat		Repeat
-HiLink ProgressReserved		Statement
-HiLink ProgressSpaceError	Error
-HiLink ProgressString		String
-HiLink ProgressTodo		Todo
-HiLink ProgressType		Statement
-HiLink ProgressShowTab		Error
+hi def link ProgressByte		Number
+hi def link ProgressCase		Repeat
+hi def link ProgressComment		Comment
+hi def link ProgressConditional	Conditional
+hi def link ProgressDebug		Debug
+hi def link ProgressDo		Repeat
+hi def link ProgressEndError		Error
+hi def link ProgressFor		Repeat
+hi def link ProgressFunction		Procedure
+hi def link ProgressIdentifier	Identifier
+hi def link ProgressInclude		Include
+hi def link ProgressMatrixDelimiter	Identifier
+hi def link ProgressNumber		Number
+hi def link ProgressOperator		Operator
+hi def link ProgressPreProc		PreProc
+hi def link ProgressProcedure	Procedure
+hi def link ProgressQuote		Delimiter
+hi def link ProgressRepeat		Repeat
+hi def link ProgressReserved		Statement
+hi def link ProgressSpaceError	Error
+hi def link ProgressString		String
+hi def link ProgressTodo		Todo
+hi def link ProgressType		Statement
+hi def link ProgressShowTab		Error
 
-delcommand HiLink
 
 let b:current_syntax = "progress"
 
diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim
--- a/runtime/syntax/prolog.vim
+++ b/runtime/syntax/prolog.vim
@@ -77,36 +77,34 @@ syn sync maxlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink prologComment          Comment
-HiLink prologCComment         Comment
-HiLink prologCharCode         Special
+hi def link prologComment          Comment
+hi def link prologCComment         Comment
+hi def link prologCharCode         Special
 
 if exists ("prolog_highlighting_clean")
 
-HiLink prologKeyword        Statement
-HiLink prologClauseHead     Statement
-HiLink prologClause Normal
+hi def link prologKeyword        Statement
+hi def link prologClauseHead     Statement
+hi def link prologClause Normal
 
 else
 
-HiLink prologKeyword        Keyword
-HiLink prologClauseHead     Constant
-HiLink prologClause Normal
-HiLink prologQuestion       PreProc
-HiLink prologSpecialCharacter Special
-HiLink prologNumber         Number
-HiLink prologAsIs           Normal
-HiLink prologCommentError   Error
-HiLink prologAtom           String
-HiLink prologString         String
-HiLink prologOperator       Operator
+hi def link prologKeyword        Keyword
+hi def link prologClauseHead     Constant
+hi def link prologClause Normal
+hi def link prologQuestion       PreProc
+hi def link prologSpecialCharacter Special
+hi def link prologNumber         Number
+hi def link prologAsIs           Normal
+hi def link prologCommentError   Error
+hi def link prologAtom           String
+hi def link prologString         String
+hi def link prologOperator       Operator
 
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "prolog"
 
diff --git a/runtime/syntax/psf.vim b/runtime/syntax/psf.vim
--- a/runtime/syntax/psf.vim
+++ b/runtime/syntax/psf.vim
@@ -72,18 +72,16 @@ syn match  psfComment "#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink psfObject       Statement
-HiLink psfAttrib       Type
-HiLink psfQuotString   String
-HiLink psfObjTag       Identifier
-HiLink psfAttAbbrev    PreProc
-HiLink psfObjTags      Identifier
+hi def link psfObject       Statement
+hi def link psfAttrib       Type
+hi def link psfQuotString   String
+hi def link psfObjTag       Identifier
+hi def link psfAttAbbrev    PreProc
+hi def link psfObjTags      Identifier
 
-HiLink psfComment      Comment
+hi def link psfComment      Comment
 
-delcommand HiLink
 
 " Long descriptions and copyrights confuse the syntax highlighting, so
 " force vim to backup at least 100 lines before the top visible line
diff --git a/runtime/syntax/ptcap.vim b/runtime/syntax/ptcap.vim
--- a/runtime/syntax/ptcap.vim
+++ b/runtime/syntax/ptcap.vim
@@ -70,27 +70,25 @@ syn region ptcapField	    start=":" skip
 syn region ptcapString	    matchgroup=ptcapOperator start="=" skip="[^\\]\(\\\\\)*\\:" matchgroup=ptcapDelimiter end=":"me=e-1 matchgroup=NONE end="[^\\]\(\\\\\)*[^\\]$" end="^$" contains=ptcapEscapedChar,ptcapLineCont keepend contained
 syn region ptcapComment	    start="^\s*#" end="$" contains=ptcapLeadBlank
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ptcapComment		Comment
-HiLink ptcapDelimiter	Delimiter
+hi def link ptcapComment		Comment
+hi def link ptcapDelimiter	Delimiter
 " The highlighting of "ptcapEntry" should always be overridden by
 " its contents, so I use Todo highlighting to indicate that there
 " is work to be done with the syntax file if you can see it :-)
-HiLink ptcapEntry		Todo
-HiLink ptcapError		Error
-HiLink ptcapEscapedChar	SpecialChar
-HiLink ptcapField		Type
-HiLink ptcapLeadBlank	NONE
-HiLink ptcapLineCont	Special
-HiLink ptcapNames		Label
-HiLink ptcapNumber		NONE
-HiLink ptcapNumberError	Error
-HiLink ptcapOperator	Operator
-HiLink ptcapSpecialCap	Type
-HiLink ptcapString		NONE
+hi def link ptcapEntry		Todo
+hi def link ptcapError		Error
+hi def link ptcapEscapedChar	SpecialChar
+hi def link ptcapField		Type
+hi def link ptcapLeadBlank	NONE
+hi def link ptcapLineCont	Special
+hi def link ptcapNames		Label
+hi def link ptcapNumber		NONE
+hi def link ptcapNumberError	Error
+hi def link ptcapOperator	Operator
+hi def link ptcapSpecialCap	Type
+hi def link ptcapString		NONE
 
-delcommand HiLink
 
 let b:current_syntax = "ptcap"
 
diff --git a/runtime/syntax/purifylog.vim b/runtime/syntax/purifylog.vim
--- a/runtime/syntax/purifylog.vim
+++ b/runtime/syntax/purifylog.vim
@@ -55,53 +55,51 @@ syn match purifyLogZPW "^ZPW:.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink purifyLogFIU purifyLogInformational
-HiLink purifyLogMAF purifyLogInformational
-HiLink purifyLogMIU purifyLogInformational
-HiLink purifyLogSIG purifyLogInformational
-HiLink purifyLogWPF purifyLogInformational
-HiLink purifyLogWPM purifyLogInformational
-HiLink purifyLogWPN purifyLogInformational
-HiLink purifyLogWPR purifyLogInformational
-HiLink purifyLogWPW purifyLogInformational
-HiLink purifyLogWPX purifyLogInformational
+hi def link purifyLogFIU purifyLogInformational
+hi def link purifyLogMAF purifyLogInformational
+hi def link purifyLogMIU purifyLogInformational
+hi def link purifyLogSIG purifyLogInformational
+hi def link purifyLogWPF purifyLogInformational
+hi def link purifyLogWPM purifyLogInformational
+hi def link purifyLogWPN purifyLogInformational
+hi def link purifyLogWPR purifyLogInformational
+hi def link purifyLogWPW purifyLogInformational
+hi def link purifyLogWPX purifyLogInformational
 
-HiLink purifyLogABR purifyLogWarning
-HiLink purifyLogBSR purifyLogWarning
-HiLink purifyLogBSW purifyLogWarning
-HiLink purifyLogFMR purifyLogWarning
-HiLink purifyLogMLK purifyLogWarning
-HiLink purifyLogMSE purifyLogWarning
-HiLink purifyLogPAR purifyLogWarning
-HiLink purifyLogPLK purifyLogWarning
-HiLink purifyLogSBR purifyLogWarning
-HiLink purifyLogSOF purifyLogWarning
-HiLink purifyLogUMC purifyLogWarning
-HiLink purifyLogUMR purifyLogWarning
+hi def link purifyLogABR purifyLogWarning
+hi def link purifyLogBSR purifyLogWarning
+hi def link purifyLogBSW purifyLogWarning
+hi def link purifyLogFMR purifyLogWarning
+hi def link purifyLogMLK purifyLogWarning
+hi def link purifyLogMSE purifyLogWarning
+hi def link purifyLogPAR purifyLogWarning
+hi def link purifyLogPLK purifyLogWarning
+hi def link purifyLogSBR purifyLogWarning
+hi def link purifyLogSOF purifyLogWarning
+hi def link purifyLogUMC purifyLogWarning
+hi def link purifyLogUMR purifyLogWarning
 
-HiLink purifyLogABW purifyLogCorrupting
-HiLink purifyLogBRK purifyLogCorrupting
-HiLink purifyLogFMW purifyLogCorrupting
-HiLink purifyLogFNH purifyLogCorrupting
-HiLink purifyLogFUM purifyLogCorrupting
-HiLink purifyLogMRE purifyLogCorrupting
-HiLink purifyLogSBW purifyLogCorrupting
+hi def link purifyLogABW purifyLogCorrupting
+hi def link purifyLogBRK purifyLogCorrupting
+hi def link purifyLogFMW purifyLogCorrupting
+hi def link purifyLogFNH purifyLogCorrupting
+hi def link purifyLogFUM purifyLogCorrupting
+hi def link purifyLogMRE purifyLogCorrupting
+hi def link purifyLogSBW purifyLogCorrupting
 
-HiLink purifyLogCOR purifyLogFatal
-HiLink purifyLogNPR purifyLogFatal
-HiLink purifyLogNPW purifyLogFatal
-HiLink purifyLogZPR purifyLogFatal
-HiLink purifyLogZPW purifyLogFatal
+hi def link purifyLogCOR purifyLogFatal
+hi def link purifyLogNPR purifyLogFatal
+hi def link purifyLogNPW purifyLogFatal
+hi def link purifyLogZPR purifyLogFatal
+hi def link purifyLogZPW purifyLogFatal
 
-HiLink purifyLogHeader		Comment
-HiLink purifyLogInformational	PreProc
-HiLink purifyLogWarning		Type
-HiLink purifyLogCorrupting	Error
-HiLink purifyLogFatal		Error
+hi def link purifyLogHeader		Comment
+hi def link purifyLogInformational	PreProc
+hi def link purifyLogWarning		Type
+hi def link purifyLogCorrupting	Error
+hi def link purifyLogFatal		Error
 
-delcommand HiLink
 
 let b:current_syntax = "purifylog"
 
diff --git a/runtime/syntax/pyrex.vim b/runtime/syntax/pyrex.vim
--- a/runtime/syntax/pyrex.vim
+++ b/runtime/syntax/pyrex.vim
@@ -37,17 +37,15 @@ syn match   pythonInclude     "from"
 syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink pyrexStatement		Statement
-HiLink pyrexType		Type
-HiLink pyrexStructure		Structure
-HiLink pyrexInclude		PreCondit
-HiLink pyrexAccess		pyrexStatement
+hi def link pyrexStatement		Statement
+hi def link pyrexType		Type
+hi def link pyrexStructure		Structure
+hi def link pyrexInclude		PreCondit
+hi def link pyrexAccess		pyrexStatement
 if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
-HiLink pyrexBuiltin	Function
+hi def link pyrexBuiltin	Function
 endif
-HiLink pyrexForFrom		Statement
+hi def link pyrexForFrom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "pyrex"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -289,44 +289,42 @@ endif
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlight links.  Can be overridden later.
-HiLink pythonStatement	Statement
-HiLink pythonConditional	Conditional
-HiLink pythonRepeat		Repeat
-HiLink pythonOperator		Operator
-HiLink pythonException	Exception
-HiLink pythonInclude		Include
-HiLink pythonAsync		Statement
-HiLink pythonDecorator	Define
-HiLink pythonDecoratorName	Function
-HiLink pythonFunction		Function
-HiLink pythonComment		Comment
-HiLink pythonTodo		Todo
-HiLink pythonString		String
-HiLink pythonRawString	String
-HiLink pythonQuotes		String
-HiLink pythonTripleQuotes	pythonQuotes
-HiLink pythonEscape		Special
+hi def link pythonStatement	Statement
+hi def link pythonConditional	Conditional
+hi def link pythonRepeat		Repeat
+hi def link pythonOperator		Operator
+hi def link pythonException	Exception
+hi def link pythonInclude		Include
+hi def link pythonAsync		Statement
+hi def link pythonDecorator	Define
+hi def link pythonDecoratorName	Function
+hi def link pythonFunction		Function
+hi def link pythonComment		Comment
+hi def link pythonTodo		Todo
+hi def link pythonString		String
+hi def link pythonRawString	String
+hi def link pythonQuotes		String
+hi def link pythonTripleQuotes	pythonQuotes
+hi def link pythonEscape		Special
 if !exists("python_no_number_highlight")
-  HiLink pythonNumber		Number
+  hi def link pythonNumber		Number
 endif
 if !exists("python_no_builtin_highlight")
-  HiLink pythonBuiltin	Function
+  hi def link pythonBuiltin	Function
 endif
 if !exists("python_no_exception_highlight")
-  HiLink pythonExceptions	Structure
+  hi def link pythonExceptions	Structure
 endif
 if exists("python_space_error_highlight")
-  HiLink pythonSpaceError	Error
+  hi def link pythonSpaceError	Error
 endif
 if !exists("python_no_doctest_highlight")
-  HiLink pythonDoctest	Special
-  HiLink pythonDoctestValue	Define
+  hi def link pythonDoctest	Special
+  hi def link pythonDoctestValue	Define
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "python"
 
diff --git a/runtime/syntax/radiance.vim b/runtime/syntax/radiance.vim
--- a/runtime/syntax/radiance.vim
+++ b/runtime/syntax/radiance.vim
@@ -124,20 +124,18 @@ syn match radianceComment "#.*$" contain
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink radianceKeyword	Keyword
-HiLink radianceExtraType	Type
-HiLink radianceSurfType	Type
-HiLink radianceLightType	Type
-HiLink radianceMatType	Type
-HiLink radiancePatType	Type
-HiLink radianceTexType	Type
-HiLink radianceMixType	Type
-HiLink radianceComment	Comment
-HiLink radianceCommand	Function
-HiLink radianceID		String
-HiLink radianceTodo		Todo
-delcommand HiLink
+hi def link radianceKeyword	Keyword
+hi def link radianceExtraType	Type
+hi def link radianceSurfType	Type
+hi def link radianceLightType	Type
+hi def link radianceMatType	Type
+hi def link radiancePatType	Type
+hi def link radianceTexType	Type
+hi def link radianceMixType	Type
+hi def link radianceComment	Comment
+hi def link radianceCommand	Function
+hi def link radianceID		String
+hi def link radianceTodo		Todo
 
 let b:current_syntax = "radiance"
 
diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim
--- a/runtime/syntax/ratpoison.vim
+++ b/runtime/syntax/ratpoison.vim
@@ -245,24 +245,22 @@ syn match   ratpoisonVoidCommand	"^\s*\z
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ratpoisonBooleanArg	Boolean
-HiLink ratpoisonCommandArg	Keyword
-HiLink ratpoisonComment	Comment
-HiLink ratpoisonDefCommand	Identifier
-HiLink ratpoisonGravityArg	Constant
-HiLink ratpoisonKeySeqArg	Special
-HiLink ratpoisonNumberArg	Number
-HiLink ratpoisonSetArg	Keyword
-HiLink ratpoisonStringCommand	Identifier
-HiLink ratpoisonTodo		Todo
-HiLink ratpoisonVoidCommand	Identifier
-HiLink ratpoisonWinFmtArg	Special
-HiLink ratpoisonWinNameArg	Constant
-HiLink ratpoisonWinListArg	Constant
+hi def link ratpoisonBooleanArg	Boolean
+hi def link ratpoisonCommandArg	Keyword
+hi def link ratpoisonComment	Comment
+hi def link ratpoisonDefCommand	Identifier
+hi def link ratpoisonGravityArg	Constant
+hi def link ratpoisonKeySeqArg	Special
+hi def link ratpoisonNumberArg	Number
+hi def link ratpoisonSetArg	Keyword
+hi def link ratpoisonStringCommand	Identifier
+hi def link ratpoisonTodo		Todo
+hi def link ratpoisonVoidCommand	Identifier
+hi def link ratpoisonWinFmtArg	Special
+hi def link ratpoisonWinNameArg	Constant
+hi def link ratpoisonWinListArg	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "ratpoison"
 
diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim
--- a/runtime/syntax/rc.vim
+++ b/runtime/syntax/rc.vim
@@ -146,33 +146,32 @@ syn sync ccomment rcComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcCharacter	Character
-HiLink rcSpecialCharacter rcSpecial
-HiLink rcNumber	Number
-HiLink rcFloat	Float
-HiLink rcOctalError	rcError
-HiLink rcParenError	rcError
-HiLink rcInParen	rcError
-HiLink rcCommentError	rcError
-HiLink rcInclude	Include
-HiLink rcPreProc	PreProc
-HiLink rcDefine	Macro
-HiLink rcIncluded	rcString
-HiLink rcError	Error
-HiLink rcPreCondit	PreCondit
-HiLink rcCommentString rcString
-HiLink rcComment2String rcString
-HiLink rcCommentSkip	rcComment
-HiLink rcString	String
-HiLink rcComment	Comment
-HiLink rcSpecial	SpecialChar
-HiLink rcTodo	Todo
+hi def link rcCharacter	Character
+hi def link rcSpecialCharacter rcSpecial
+hi def link rcNumber	Number
+hi def link rcFloat	Float
+hi def link rcOctalError	rcError
+hi def link rcParenError	rcError
+hi def link rcInParen	rcError
+hi def link rcCommentError	rcError
+hi def link rcInclude	Include
+hi def link rcPreProc	PreProc
+hi def link rcDefine	Macro
+hi def link rcIncluded	rcString
+hi def link rcError	Error
+hi def link rcPreCondit	PreCondit
+hi def link rcCommentString rcString
+hi def link rcComment2String rcString
+hi def link rcCommentSkip	rcComment
+hi def link rcString	String
+hi def link rcComment	Comment
+hi def link rcSpecial	SpecialChar
+hi def link rcTodo	Todo
 
-HiLink rcAttribute	rcCommonAttribute
-HiLink rcStdId	rcStatement
-HiLink rcStatement	Statement
+hi def link rcAttribute	rcCommonAttribute
+hi def link rcStdId	rcStatement
+hi def link rcStatement	Statement
 
 " Default color overrides
 hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
@@ -183,9 +182,8 @@ hi def rcParam	ctermfg=DarkGreen guifg=D
 hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
 hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
 
-"HiLink rcIdentifier	Identifier
+"hi def link rcIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rc"
 
diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim
--- a/runtime/syntax/rcs.vim
+++ b/runtime/syntax/rcs.vim
@@ -50,16 +50,14 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcsKeyword     Keyword
-HiLink rcsNumber      Identifier
-HiLink rcsString      String
-HiLink rcsTextStr     String
-HiLink rcsSpecial     Special
-HiLink rcsDiffLines   Special
-HiLink rcsEOFError    Error
+hi def link rcsKeyword     Keyword
+hi def link rcsNumber      Identifier
+hi def link rcsString      String
+hi def link rcsTextStr     String
+hi def link rcsSpecial     Special
+hi def link rcsDiffLines   Special
+hi def link rcsEOFError    Error
 
-delcommand HiLink
 
 let b:current_syntax = "rcs"
diff --git a/runtime/syntax/rcslog.vim b/runtime/syntax/rcslog.vim
--- a/runtime/syntax/rcslog.vim
+++ b/runtime/syntax/rcslog.vim
@@ -14,13 +14,11 @@ syn match rcslogDate		"^date: .*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcslogFile		Type
-HiLink rcslogRevision	Constant
-HiLink rcslogDate		Identifier
+hi def link rcslogFile		Type
+hi def link rcslogRevision	Constant
+hi def link rcslogDate		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rcslog"
 
diff --git a/runtime/syntax/rebol.vim b/runtime/syntax/rebol.vim
--- a/runtime/syntax/rebol.vim
+++ b/runtime/syntax/rebol.vim
@@ -139,56 +139,54 @@ syn keyword     rebolConstant   none
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rebolTodo     Todo
+hi def link rebolTodo     Todo
 
-HiLink rebolStatement Statement
-HiLink rebolLabel	Label
-HiLink rebolConditional Conditional
-HiLink rebolRepeat	Repeat
+hi def link rebolStatement Statement
+hi def link rebolLabel	Label
+hi def link rebolConditional Conditional
+hi def link rebolRepeat	Repeat
 
-HiLink rebolOperator	Operator
-HiLink rebolLogicOperator rebolOperator
-HiLink rebolLogicFunction rebolLogicOperator
-HiLink rebolMathOperator rebolOperator
-HiLink rebolMathFunction rebolMathOperator
-HiLink rebolBinaryOperator rebolOperator
-HiLink rebolBinaryFunction rebolBinaryOperator
+hi def link rebolOperator	Operator
+hi def link rebolLogicOperator rebolOperator
+hi def link rebolLogicFunction rebolLogicOperator
+hi def link rebolMathOperator rebolOperator
+hi def link rebolMathFunction rebolMathOperator
+hi def link rebolBinaryOperator rebolOperator
+hi def link rebolBinaryFunction rebolBinaryOperator
 
-HiLink rebolType     Type
-HiLink rebolTypeFunction rebolOperator
+hi def link rebolType     Type
+hi def link rebolTypeFunction rebolOperator
 
-HiLink rebolWord     Identifier
-HiLink rebolWordPath rebolWord
-HiLink rebolFunction	Function
+hi def link rebolWord     Identifier
+hi def link rebolWordPath rebolWord
+hi def link rebolFunction	Function
 
-HiLink rebolCharacter Character
-HiLink rebolSpecialCharacter SpecialChar
-HiLink rebolString	String
+hi def link rebolCharacter Character
+hi def link rebolSpecialCharacter SpecialChar
+hi def link rebolString	String
 
-HiLink rebolNumber   Number
-HiLink rebolInteger  rebolNumber
-HiLink rebolDecimal  rebolNumber
-HiLink rebolTime     rebolNumber
-HiLink rebolDate     rebolNumber
-HiLink rebolMoney    rebolNumber
-HiLink rebolBinary   rebolNumber
-HiLink rebolEmail    rebolString
-HiLink rebolFile     rebolString
-HiLink rebolURL      rebolString
-HiLink rebolIssue    rebolNumber
-HiLink rebolTuple    rebolNumber
-HiLink rebolFloat    Float
-HiLink rebolBoolean  Boolean
+hi def link rebolNumber   Number
+hi def link rebolInteger  rebolNumber
+hi def link rebolDecimal  rebolNumber
+hi def link rebolTime     rebolNumber
+hi def link rebolDate     rebolNumber
+hi def link rebolMoney    rebolNumber
+hi def link rebolBinary   rebolNumber
+hi def link rebolEmail    rebolString
+hi def link rebolFile     rebolString
+hi def link rebolURL      rebolString
+hi def link rebolIssue    rebolNumber
+hi def link rebolTuple    rebolNumber
+hi def link rebolFloat    Float
+hi def link rebolBoolean  Boolean
 
-HiLink rebolConstant Constant
-
-HiLink rebolComment	Comment
+hi def link rebolConstant Constant
 
-HiLink rebolError	Error
+hi def link rebolComment	Comment
 
-delcommand HiLink
+hi def link rebolError	Error
+
 
 if exists("my_rebol_file")
   if file_readable(expand(my_rebol_file))
diff --git a/runtime/syntax/registry.vim b/runtime/syntax/registry.vim
--- a/runtime/syntax/registry.vim
+++ b/runtime/syntax/registry.vim
@@ -82,22 +82,20 @@ syn match registryHex		"^\s*\([0-9a-fA-F
 " Dword (32 bits)
 syn match registryDword		"dword:[0-9a-fA-F]\{8}$" contains=registrySpecial
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink registryComment	Comment
-HiLink registryHead		Constant
-HiLink registryHKEY		Constant
-HiLink registryPath		Special
-HiLink registryRemove	PreProc
-HiLink registryGUID		Identifier
-HiLink registrySpecial	Special
-HiLink registrySubKey	Type
-HiLink registryString	String
-HiLink registryHex		Number
-HiLink registryDword		Number
+hi def link registryComment	Comment
+hi def link registryHead		Constant
+hi def link registryHKEY		Constant
+hi def link registryPath		Special
+hi def link registryRemove	PreProc
+hi def link registryGUID		Identifier
+hi def link registrySpecial	Special
+hi def link registrySubKey	Type
+hi def link registryString	String
+hi def link registryHex		Number
+hi def link registryDword		Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "registry"
diff --git a/runtime/syntax/remind.vim b/runtime/syntax/remind.vim
--- a/runtime/syntax/remind.vim
+++ b/runtime/syntax/remind.vim
@@ -47,28 +47,26 @@ syn match remindDates		"'[0-9]\{4}[/-][0
 syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink remindCommands		Function
-HiLink remindExpiry		Repeat
-HiLink remindTag		Label
-HiLink remindTimed		Statement
-HiLink remindMove		Statement
-HiLink remindSpecial		Include
-HiLink remindRun		Function
-HiLink remindConditional	Conditional
-HiLink remindComment		Comment
-HiLink remindTimes		String
-HiLink remindString		String
-HiLink remindDebug		Debug
-HiLink remindVar		Identifier
-HiLink remindSubst		Constant
-HiLink remindAdvanceNumber	Number
-HiLink remindDateSeparators	Comment
-HiLink remindDates		String
-HiLink remindWarning		Error
+hi def link remindCommands		Function
+hi def link remindExpiry		Repeat
+hi def link remindTag		Label
+hi def link remindTimed		Statement
+hi def link remindMove		Statement
+hi def link remindSpecial		Include
+hi def link remindRun		Function
+hi def link remindConditional	Conditional
+hi def link remindComment		Comment
+hi def link remindTimes		String
+hi def link remindString		String
+hi def link remindDebug		Debug
+hi def link remindVar		Identifier
+hi def link remindSubst		Constant
+hi def link remindAdvanceNumber	Number
+hi def link remindDateSeparators	Comment
+hi def link remindDates		String
+hi def link remindWarning		Error
 
-delcommand HiLink
 
 let b:current_syntax = "remind"
 
diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim
--- a/runtime/syntax/resolv.vim
+++ b/runtime/syntax/resolv.vim
@@ -49,31 +49,29 @@ syn match resolvOption /\<\%(ndots\|time
 " Additional errors
 syn match resolvError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink resolvIP Number
-HiLink resolvIPNetmask Number
-HiLink resolvHostname String
-HiLink resolvOption String
+hi def link resolvIP Number
+hi def link resolvIPNetmask Number
+hi def link resolvHostname String
+hi def link resolvOption String
 
-HiLink resolvIPNameserver Number
-HiLink resolvHostnameSearch String
-HiLink resolvIPNetmaskSortList Number
+hi def link resolvIPNameserver Number
+hi def link resolvHostnameSearch String
+hi def link resolvIPNetmaskSortList Number
 
-HiLink resolvNameServer Identifier
-HiLink resolvLwserver Identifier
-HiLink resolvDomain Identifier
-HiLink resolvSearch Identifier
-HiLink resolvSortList Identifier
-HiLink resolvOptions Identifier
+hi def link resolvNameServer Identifier
+hi def link resolvLwserver Identifier
+hi def link resolvDomain Identifier
+hi def link resolvSearch Identifier
+hi def link resolvSortList Identifier
+hi def link resolvOptions Identifier
 
-HiLink resolvComment Comment
-HiLink resolvOperator Operator
-HiLink resolvError Error
-HiLink resolvIPError Error
-HiLink resolvIPSpecial Special
+hi def link resolvComment Comment
+hi def link resolvOperator Operator
+hi def link resolvError Error
+hi def link resolvIPError Error
+hi def link resolvIPSpecial Special
 
-delcommand HiLink
 
 let b:current_syntax = "resolv"
 
diff --git a/runtime/syntax/rexx.vim b/runtime/syntax/rexx.vim
--- a/runtime/syntax/rexx.vim
+++ b/runtime/syntax/rexx.vim
@@ -242,78 +242,76 @@ exec "syn sync fromstart"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " make binary and hex strings stand out
 hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
 
-HiLink rexxLabel2		Function
-HiLink doLoopSelectLabelRegion	rexxKeyword
-HiLink endIterateLeaveLabelRegion	rexxKeyword
-HiLink rexxLoopKeywords	rexxKeyword " Todo
+hi def link rexxLabel2		Function
+hi def link doLoopSelectLabelRegion	rexxKeyword
+hi def link endIterateLeaveLabelRegion	rexxKeyword
+hi def link rexxLoopKeywords	rexxKeyword " Todo
 
-HiLink rexxNumber		Normal "DiffChange
-"  HiLink rexxIdentifier		DiffChange
+hi def link rexxNumber		Normal "DiffChange
+"  hi def link rexxIdentifier		DiffChange
 
-HiLink rexxRegularCallSignal	Statement
-HiLink rexxExceptionHandling	Statement
+hi def link rexxRegularCallSignal	Statement
+hi def link rexxExceptionHandling	Statement
 
-HiLink rexxLabel		Function
-HiLink rexxCharacter		Character
-HiLink rexxParenError		rexxError
-HiLink rexxInParen		rexxError
-HiLink rexxCommentError	rexxError
-HiLink rexxError		Error
-HiLink rexxKeyword		Statement
-HiLink rexxKeywordStatements	Statement
+hi def link rexxLabel		Function
+hi def link rexxCharacter		Character
+hi def link rexxParenError		rexxError
+hi def link rexxInParen		rexxError
+hi def link rexxCommentError	rexxError
+hi def link rexxError		Error
+hi def link rexxKeyword		Statement
+hi def link rexxKeywordStatements	Statement
 
-HiLink rexxFunction		Function
-HiLink rexxString		String
-HiLink rexxComment		Comment
-HiLink rexxTodo		Todo
-HiLink rexxSpecialVariable	Special
-HiLink rexxConditional	rexxKeyword
+hi def link rexxFunction		Function
+hi def link rexxString		String
+hi def link rexxComment		Comment
+hi def link rexxTodo		Todo
+hi def link rexxSpecialVariable	Special
+hi def link rexxConditional	rexxKeyword
 
-HiLink rexxOperator		Operator
-HiLink rexxMessageOperator	rexxOperator
-HiLink rexxLineComment	Comment
+hi def link rexxOperator		Operator
+hi def link rexxMessageOperator	rexxOperator
+hi def link rexxLineComment	Comment
 
-HiLink rexxLineContinue	WildMenu
+hi def link rexxLineContinue	WildMenu
 
-HiLink rexxDirective		rexxKeyword
-HiLink rexxClassDirective	Type
-HiLink rexxMethodDirective	rexxFunction
-HiLink rexxAttributeDirective	rexxFunction
-HiLink rexxRequiresDirective	Include
-HiLink rexxRoutineDirective	rexxFunction
+hi def link rexxDirective		rexxKeyword
+hi def link rexxClassDirective	Type
+hi def link rexxMethodDirective	rexxFunction
+hi def link rexxAttributeDirective	rexxFunction
+hi def link rexxRequiresDirective	Include
+hi def link rexxRoutineDirective	rexxFunction
 
 " rgf, 2012-09-09
-HiLink rexxOptionsDirective	rexxFunction
-HiLink rexxOptionsDirective2  rexxOptionsDirective
-HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
+hi def link rexxOptionsDirective	rexxFunction
+hi def link rexxOptionsDirective2  rexxOptionsDirective
+hi def link rexxOptionsDirective3  Normal " rexxOptionsDirective
 
-HiLink rexxConstantDirective	rexxFunction
+hi def link rexxConstantDirective	rexxFunction
 
-HiLink rexxConst		Constant
-HiLink rexxTypeSpecifier	Type
-HiLink rexxBuiltinClass	rexxTypeSpecifier
+hi def link rexxConst		Constant
+hi def link rexxTypeSpecifier	Type
+hi def link rexxBuiltinClass	rexxTypeSpecifier
 
-HiLink rexxEnvironmentSymbol  rexxConst
-HiLink rexxMessage		rexxFunction
+hi def link rexxEnvironmentSymbol  rexxConst
+hi def link rexxMessage		rexxFunction
 
-HiLink rexxParse              rexxKeyword
-HiLink rexxParse2             rexxParse
+hi def link rexxParse              rexxKeyword
+hi def link rexxParse2             rexxParse
 
-HiLink rexxGuard              rexxKeyword
-HiLink rexxTrace              rexxKeyword
+hi def link rexxGuard              rexxKeyword
+hi def link rexxTrace              rexxKeyword
 
-HiLink rexxRaise              rexxKeyword
-HiLink rexxRaise2             rexxRaise
+hi def link rexxRaise              rexxKeyword
+hi def link rexxRaise2             rexxRaise
 
-HiLink rexxForward            rexxKeyword
-HiLink rexxForward2           rexxForward
+hi def link rexxForward            rexxKeyword
+hi def link rexxForward2           rexxForward
 
-delcommand HiLink
 
 let b:current_syntax = "rexx"
 
diff --git a/runtime/syntax/rib.vim b/runtime/syntax/rib.vim
--- a/runtime/syntax/rib.vim
+++ b/runtime/syntax/rib.vim
@@ -44,19 +44,17 @@ syn match	ribFloat	  display contained "
 syn match	ribFloat	  display contained "[-]\=\d\+e[-+]\d\+\>"
 syn case match
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ribStructure		Structure
-HiLink ribCommand		Statement
+hi def link ribStructure		Structure
+hi def link ribCommand		Statement
 
-HiLink ribStructureComment	SpecialComment
-HiLink ribLineComment		Comment
+hi def link ribStructureComment	SpecialComment
+hi def link ribLineComment		Comment
 
-HiLink ribString		String
-HiLink ribNumber		Number
-HiLink ribFloat		Float
+hi def link ribString		String
+hi def link ribNumber		Number
+hi def link ribFloat		Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "rib"
diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim
--- a/runtime/syntax/robots.vim
+++ b/runtime/syntax/robots.vim
@@ -38,19 +38,17 @@ syn match  robotsUrl		"http[s]\=://\S*"
 syn match  robotsMail		"\S*@\S*"
 syn region robotsString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink robotsComment		Comment
-HiLink robotsAgent		Type
-HiLink robotsDisallow		Statement
-HiLink robotsLine		Special
-HiLink robotsStar		Operator
-HiLink robotsDelimiter	Delimiter
-HiLink robotsUrl		String
-HiLink robotsMail		String
-HiLink robotsString		String
+hi def link robotsComment		Comment
+hi def link robotsAgent		Type
+hi def link robotsDisallow		Statement
+hi def link robotsLine		Special
+hi def link robotsStar		Operator
+hi def link robotsDelimiter	Delimiter
+hi def link robotsUrl		String
+hi def link robotsMail		String
+hi def link robotsString		String
 
-delcommand HiLink
 
 
 let b:current_syntax = "robots"
diff --git a/runtime/syntax/rpcgen.vim b/runtime/syntax/rpcgen.vim
--- a/runtime/syntax/rpcgen.vim
+++ b/runtime/syntax/rpcgen.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	rpcgen
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Jan 13, 2015
-" Version:	10
+" Last Change:	Aug 31, 2016
+" Version:	12
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
 
 if exists("b:current_syntax")
@@ -24,23 +24,22 @@ syn match   rpcProgNmbrErr contained	"=\
 syn match   rpcPassThru			"^\s*%.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_rpcgen_syntax_inits")
 
-HiLink rpcProgName	rpcName
-HiLink rpcProgram	rpcStatement
-HiLink rpcVersName	rpcName
-HiLink rpcVersion	rpcStatement
+  hi def link rpcProgName	rpcName
+  hi def link rpcProgram	rpcStatement
+  hi def link rpcVersName	rpcName
+  hi def link rpcVersion	rpcStatement
 
-HiLink rpcDecl	cType
-HiLink rpcPassThru	cComment
+  hi def link rpcDecl	cType
+  hi def link rpcPassThru	cComment
 
-HiLink rpcName	Special
-HiLink rpcProcNmbr	Delimiter
-HiLink rpcProgNmbrErr	Error
-HiLink rpcStatement	Statement
+  hi def link rpcName	Special
+  hi def link rpcProcNmbr	Delimiter
+  hi def link rpcProgNmbrErr	Error
+  hi def link rpcStatement	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "rpcgen"
 
diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim
--- a/runtime/syntax/rpl.vim
+++ b/runtime/syntax/rpl.vim
@@ -415,68 +415,66 @@ syntax match rplTab "\t"  transparent
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink highlight default link <args>
 
 " The default highlighting.
 
-HiLink rplControl		Statement
-HiLink rplStatement		Statement
-HiLink rplAlgConditional	Conditional
-HiLink rplConditional		Repeat
-HiLink rplConditionalError	Error
-HiLink rplRepeat		Repeat
-HiLink rplCycle		Repeat
-HiLink rplUntil		Repeat
-HiLink rplIntrinsic		Special
-HiLink rplStorage		StorageClass
-HiLink rplStorageExpr		StorageClass
-HiLink rplStorageError	Error
-HiLink rplReadWrite		rplIntrinsic
+hi def link rplControl		Statement
+hi def link rplStatement		Statement
+hi def link rplAlgConditional	Conditional
+hi def link rplConditional		Repeat
+hi def link rplConditionalError	Error
+hi def link rplRepeat		Repeat
+hi def link rplCycle		Repeat
+hi def link rplUntil		Repeat
+hi def link rplIntrinsic		Special
+hi def link rplStorage		StorageClass
+hi def link rplStorageExpr		StorageClass
+hi def link rplStorageError	Error
+hi def link rplReadWrite		rplIntrinsic
 
-HiLink rplOperator		Operator
+hi def link rplOperator		Operator
 
-HiLink rplList		Special
-HiLink rplArray		Special
-HiLink rplConstant		Identifier
-HiLink rplExpr		Type
+hi def link rplList		Special
+hi def link rplArray		Special
+hi def link rplConstant		Identifier
+hi def link rplExpr		Type
 
-HiLink rplString		String
-HiLink rplStringGuilles	String
-HiLink rplStringAntislash	String
+hi def link rplString		String
+hi def link rplStringGuilles	String
+hi def link rplStringAntislash	String
 
-HiLink rplBinary		Boolean
-HiLink rplOctal		Boolean
-HiLink rplDecimal		Boolean
-HiLink rplHexadecimal		Boolean
-HiLink rplInteger		Number
-HiLink rplFloat		Float
-HiLink rplComplex		Float
-HiLink rplBoolean		Identifier
+hi def link rplBinary		Boolean
+hi def link rplOctal		Boolean
+hi def link rplDecimal		Boolean
+hi def link rplHexadecimal		Boolean
+hi def link rplInteger		Number
+hi def link rplFloat		Float
+hi def link rplComplex		Float
+hi def link rplBoolean		Identifier
 
-HiLink rplObsolete		Todo
+hi def link rplObsolete		Todo
 
-HiLink rplPreCondit		PreCondit
-HiLink rplInclude		Include
-HiLink rplIncluded		rplString
-HiLink rplInclude		Include
-HiLink rplExecPath		Include
-HiLink rplPreProc		PreProc
-HiLink rplComment		Comment
-HiLink rplCommentLine		Comment
-HiLink rplCommentString	Comment
-HiLink rplSubDelimitor	rplStorage
-HiLink rplCommentError	Error
-HiLink rplParenError		Error
-HiLink rplSubError		Error
-HiLink rplArrayError		Error
-HiLink rplListError		Error
-HiLink rplTab			Error
-HiLink rplBinaryError		Error
-HiLink rplOctalError		Error
-HiLink rplDecimalError	Error
-HiLink rplHexadecimalError	Error
+hi def link rplPreCondit		PreCondit
+hi def link rplInclude		Include
+hi def link rplIncluded		rplString
+hi def link rplInclude		Include
+hi def link rplExecPath		Include
+hi def link rplPreProc		PreProc
+hi def link rplComment		Comment
+hi def link rplCommentLine		Comment
+hi def link rplCommentString	Comment
+hi def link rplSubDelimitor	rplStorage
+hi def link rplCommentError	Error
+hi def link rplParenError		Error
+hi def link rplSubError		Error
+hi def link rplArrayError		Error
+hi def link rplListError		Error
+hi def link rplTab			Error
+hi def link rplBinaryError		Error
+hi def link rplOctalError		Error
+hi def link rplDecimalError	Error
+hi def link rplHexadecimalError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "rpl"
 
diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim
--- a/runtime/syntax/rtf.vim
+++ b/runtime/syntax/rtf.vim
@@ -50,26 +50,24 @@ syn match rtfFootNote "[#$K+]{\\footnote
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink rtfControlWord		Statement
-HiLink rtfNewControlWord	Special
-HiLink rtfControlSymbol	Constant
-HiLink rtfCharacter		Character
-HiLink rtfUnicodeCharacter	SpecialChar
-HiLink rtfFootNote		Comment
+hi def link rtfControlWord		Statement
+hi def link rtfNewControlWord	Special
+hi def link rtfControlSymbol	Constant
+hi def link rtfCharacter		Character
+hi def link rtfUnicodeCharacter	SpecialChar
+hi def link rtfFootNote		Comment
 
 " Define colors for the syntax file
 hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
 hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
 hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
 
-HiLink rtfRed	rtfRed
-HiLink rtfGreen	rtfGreen
-HiLink rtfBlue	rtfBlue
+hi def link rtfRed	rtfRed
+hi def link rtfGreen	rtfGreen
+hi def link rtfBlue	rtfBlue
 
-delcommand HiLink
 
 
 let b:current_syntax = "rtf"
diff --git a/runtime/syntax/samba.vim b/runtime/syntax/samba.vim
--- a/runtime/syntax/samba.vim
+++ b/runtime/syntax/samba.vim
@@ -105,15 +105,13 @@ syn keyword sambaKeyword contained store
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink sambaParameter Normal
-HiLink sambaKeyword   Type
-HiLink sambaSection   Statement
-HiLink sambaMacro     PreProc
-HiLink sambaComment   Comment
-HiLink sambaContinue  Operator
-HiLink sambaBoolean   Constant
-delcommand HiLink
+hi def link sambaParameter Normal
+hi def link sambaKeyword   Type
+hi def link sambaSection   Statement
+hi def link sambaMacro     PreProc
+hi def link sambaComment   Comment
+hi def link sambaContinue  Operator
+hi def link sambaBoolean   Constant
 
 let b:current_syntax = "samba"
 
diff --git a/runtime/syntax/sas.vim b/runtime/syntax/sas.vim
--- a/runtime/syntax/sas.vim
+++ b/runtime/syntax/sas.vim
@@ -41,7 +41,7 @@ syn region sasComment start=";\s*\*"hs=s
 " Comments with * starting after a semicolon (Paulo Tanimoto)
 syn region sasComment start="^\s*\*" end=";" contains=sasTodo
 
-" This line defines macro variables in code.  HiLink at end of file
+" This line defines macro variables in code.  "hi def link" at end of file
 " defines the color scheme. Begin region with ampersand and end with
 " any non-word character offset by -1; put ampersand in the skip list
 " just in case it is used to concatenate macro variable values.
@@ -213,7 +213,6 @@ syn keyword sasUnderscore	_ALL_ _AUTOMAT
 "  Define the default highlighting.
 "  Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " Default sas enhanced editor color syntax
 hi sComment	term=bold cterm=NONE ctermfg=Green ctermbg=Black gui=NONE guifg=DarkGreen guibg=White
@@ -240,25 +239,24 @@ hi lNote	term=NONE cterm=NONE ctermfg=Cy
 
 " Special hilighting for the SAS proc section
 
-HiLink	sasComment	sComment
-HiLink	sasConditional	sKeyword
-HiLink	sasStep		sSection
-HiLink	sasFunction	sKeyword
-HiLink	sasMacro	mKeyword
-HiLink	sasMacroVar	NonText
-HiLink	sasNumber	sNumber
-HiLink	sasStatement	sKeyword
-HiLink	sasString	sString
-HiLink	sasProc		sProc
+hi def link sasComment	sComment
+hi def link sasConditional	sKeyword
+hi def link sasStep		sSection
+hi def link sasFunction	sKeyword
+hi def link sasMacro	mKeyword
+hi def link sasMacroVar	NonText
+hi def link sasNumber	sNumber
+hi def link sasStatement	sKeyword
+hi def link sasString	sString
+hi def link sasProc		sProc
 " (Bob Heckel)
-HiLink	sasTodo		Todo
-HiLink	sasErrMsg	lError
-HiLink	sasWarnMsg	lWarning
-HiLink	sasLogMsg	lNote
-HiLink	sasCards	sCard
+hi def link sasTodo		Todo
+hi def link sasErrMsg	lError
+hi def link sasWarnMsg	lWarning
+hi def link sasLogMsg	lNote
+hi def link sasCards	sCard
 " (Bob Heckel)
-HiLink	sasUnderscore	PreProc
-delcommand HiLink
+hi def link sasUnderscore	PreProc
 
 " Syncronize from beginning to keep large blocks from losing
 " syntax coloring while moving through code.
diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim
--- a/runtime/syntax/sather.vim
+++ b/runtime/syntax/sather.vim
@@ -59,35 +59,33 @@ syn sync ccomment satherComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink satherBranch		satherStatement
-HiLink satherLabel		satherStatement
-HiLink satherConditional	satherStatement
-HiLink satherSynchronize	satherStatement
-HiLink satherRepeat		satherStatement
-HiLink satherExceptions	satherStatement
-HiLink satherStorageClass	satherDeclarative
-HiLink satherMethodDecl	satherDeclarative
-HiLink satherClassDecl	satherDeclarative
-HiLink satherScopeDecl	satherDeclarative
-HiLink satherBoolValue	satherValue
-HiLink satherSpecial		satherValue
-HiLink satherString		satherValue
-HiLink satherCharacter	satherValue
-HiLink satherSpecialCharacter satherValue
-HiLink satherNumber		satherValue
-HiLink satherStatement	Statement
-HiLink satherOperator		Statement
-HiLink satherComment		Comment
-HiLink satherType		Type
-HiLink satherValue		String
-HiLink satherString		String
-HiLink satherSpecial		String
-HiLink satherCharacter	String
-HiLink satherDeclarative	Type
-HiLink satherExternal		PreCondit
-delcommand HiLink
+hi def link satherBranch		satherStatement
+hi def link satherLabel		satherStatement
+hi def link satherConditional	satherStatement
+hi def link satherSynchronize	satherStatement
+hi def link satherRepeat		satherStatement
+hi def link satherExceptions	satherStatement
+hi def link satherStorageClass	satherDeclarative
+hi def link satherMethodDecl	satherDeclarative
+hi def link satherClassDecl	satherDeclarative
+hi def link satherScopeDecl	satherDeclarative
+hi def link satherBoolValue	satherValue
+hi def link satherSpecial		satherValue
+hi def link satherString		satherValue
+hi def link satherCharacter	satherValue
+hi def link satherSpecialCharacter satherValue
+hi def link satherNumber		satherValue
+hi def link satherStatement	Statement
+hi def link satherOperator		Statement
+hi def link satherComment		Comment
+hi def link satherType		Type
+hi def link satherValue		String
+hi def link satherString		String
+hi def link satherSpecial		String
+hi def link satherCharacter	String
+hi def link satherDeclarative	Type
+hi def link satherExternal		PreCondit
 
 let b:current_syntax = "sather"
 
diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -300,29 +300,27 @@ syn sync match matchPlace grouphere NONE
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink schemeSyntax		Statement
-HiLink schemeFunc		Function
+hi def link schemeSyntax		Statement
+hi def link schemeFunc		Function
 
-HiLink schemeString		String
-HiLink schemeCharacter	Character
-HiLink schemeNumber		Number
-HiLink schemeBoolean		Boolean
+hi def link schemeString		String
+hi def link schemeCharacter	Character
+hi def link schemeNumber		Number
+hi def link schemeBoolean		Boolean
 
-HiLink schemeDelimiter	Delimiter
-HiLink schemeConstant		Constant
-
-HiLink schemeComment		Comment
-HiLink schemeMultilineComment	Comment
-HiLink schemeError		Error
+hi def link schemeDelimiter	Delimiter
+hi def link schemeConstant		Constant
 
-HiLink schemeExtSyntax	Type
-HiLink schemeExtFunc		PreProc
+hi def link schemeComment		Comment
+hi def link schemeMultilineComment	Comment
+hi def link schemeError		Error
 
-HiLink schemeLang		PreProc
+hi def link schemeExtSyntax	Type
+hi def link schemeExtFunc		PreProc
 
-delcommand HiLink
+hi def link schemeLang		PreProc
+
 
 let b:current_syntax = "scheme"
 
diff --git a/runtime/syntax/scilab.vim b/runtime/syntax/scilab.vim
--- a/runtime/syntax/scilab.vim
+++ b/runtime/syntax/scilab.vim
@@ -64,40 +64,38 @@ syn match scilabOverload			"%[A-Za-z0-9?
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	scilabStatement				Statement
-HiLink	scilabFunction				Keyword
-HiLink	scilabPredicate				Keyword
-HiLink	scilabKeyword				Keyword
-HiLink	scilabDebug					Debug
-HiLink	scilabRepeat				Repeat
-HiLink	scilabConditional			Conditional
-HiLink	scilabMultiplex				Conditional
+hi def link scilabStatement				Statement
+hi def link scilabFunction				Keyword
+hi def link scilabPredicate				Keyword
+hi def link scilabKeyword				Keyword
+hi def link scilabDebug					Debug
+hi def link scilabRepeat				Repeat
+hi def link scilabConditional			Conditional
+hi def link scilabMultiplex				Conditional
 
-HiLink	scilabConstant				Constant
-HiLink	scilabBoolean				Boolean
+hi def link scilabConstant				Constant
+hi def link scilabBoolean				Boolean
 
-HiLink	scilabDelimiter				Delimiter
-HiLink	scilabMlistAccess			Delimiter
-HiLink	scilabComparison			Operator
-HiLink	scilabLogical				Operator
-HiLink	scilabAssignment			Operator
-HiLink	scilabArithmetic			Operator
-HiLink	scilabRange					Operator
-HiLink	scilabLineContinuation		Underlined
-HiLink	scilabTransposition			Operator
+hi def link scilabDelimiter				Delimiter
+hi def link scilabMlistAccess			Delimiter
+hi def link scilabComparison			Operator
+hi def link scilabLogical				Operator
+hi def link scilabAssignment			Operator
+hi def link scilabArithmetic			Operator
+hi def link scilabRange					Operator
+hi def link scilabLineContinuation		Underlined
+hi def link scilabTransposition			Operator
 
-HiLink	scilabTodo					Todo
-HiLink	scilabComment				Comment
+hi def link scilabTodo					Todo
+hi def link scilabComment				Comment
 
-HiLink	scilabNumber				Number
-HiLink	scilabString				String
+hi def link scilabNumber				Number
+hi def link scilabString				String
 
-HiLink	scilabIdentifier			Identifier
-HiLink	scilabOverload				Special
+hi def link scilabIdentifier			Identifier
+hi def link scilabOverload				Special
 
-delcommand HiLink
 
 let b:current_syntax = "scilab"
 
diff --git a/runtime/syntax/sd.vim b/runtime/syntax/sd.vim
--- a/runtime/syntax/sd.vim
+++ b/runtime/syntax/sd.vim
@@ -50,22 +50,20 @@ syn keyword sdSpecial TRUE FALSE NULL
 syn keyword sdDelimiter STREAM STREAM_END
 syn match sdError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink sdIP Number
-HiLink sdHostname Type
-HiLink sdEncoding Identifier
-HiLink sdCoding Identifier
-HiLink sdSource Identifier
-HiLink sdComment Comment
-HiLink sdIPError Error
-HiLink sdError Error
-HiLink sdStatement Statement
-HiLink sdIPSpecial Special
-HiLink sdSpecial Special
-HiLink sdDelimiter Delimiter
+hi def link sdIP Number
+hi def link sdHostname Type
+hi def link sdEncoding Identifier
+hi def link sdCoding Identifier
+hi def link sdSource Identifier
+hi def link sdComment Comment
+hi def link sdIPError Error
+hi def link sdError Error
+hi def link sdStatement Statement
+hi def link sdIPSpecial Special
+hi def link sdSpecial Special
+hi def link sdDelimiter Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "sd"
 
diff --git a/runtime/syntax/sdl.vim b/runtime/syntax/sdl.vim
--- a/runtime/syntax/sdl.vim
+++ b/runtime/syntax/sdl.vim
@@ -127,27 +127,25 @@ syn sync ccomment sdlComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi     hi def <args>
 
-HiLink  sdlException	Label
-HiLink  sdlConditional	sdlStatement
-HiLink  sdlVirtual		sdlStatement
-HiLink  sdlExported		sdlFlag
-HiLink  sdlCommentError	sdlError
-HiLink  sdlOperator		Operator
-HiLink  sdlStructure	sdlType
+hi def link sdlException	Label
+hi def link sdlConditional	sdlStatement
+hi def link sdlVirtual		sdlStatement
+hi def link sdlExported		sdlFlag
+hi def link sdlCommentError	sdlError
+hi def link sdlOperator		Operator
+hi def link sdlStructure	sdlType
 Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
 Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
 Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
 Hi	    sdlInput		term=bold guifg=Red
-HiLink  sdlType		Type
-HiLink  sdlString		String
-HiLink  sdlComment		Comment
-HiLink  sdlSpecial		Special
-HiLink  sdlError		Error
+hi def link sdlType		Type
+hi def link sdlString		String
+hi def link sdlComment		Comment
+hi def link sdlSpecial		Special
+hi def link sdlError		Error
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "sdl"
diff --git a/runtime/syntax/sed.vim b/runtime/syntax/sed.vim
--- a/runtime/syntax/sed.vim
+++ b/runtime/syntax/sed.vim
@@ -72,38 +72,36 @@ syn region sedReplacement64 matchgroup=S
 " (y) does not allow any flags.  To save memory, I ignore this problem.
 syn match sedST	"[sy]" nextgroup=sedRegexp\d\+
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sedAddress		Macro
-HiLink sedACI		NONE
-HiLink sedBranch		Label
-HiLink sedComment		Comment
-HiLink sedDelete		Function
-HiLink sedError		Error
-HiLink sedFlag		Type
-HiLink sedFlagwrite		Constant
-HiLink sedFunction		Function
-HiLink sedLabel		Label
-HiLink sedLineCont		Special
-HiLink sedPutHoldspc	Function
-HiLink sedReplaceMeta	Special
-HiLink sedRegexpMeta	Special
-HiLink sedRW		Constant
-HiLink sedSemicolon		Special
-HiLink sedST		Function
-HiLink sedSpecial		Special
-HiLink sedWhitespace	NONE
+hi def link sedAddress		Macro
+hi def link sedACI		NONE
+hi def link sedBranch		Label
+hi def link sedComment		Comment
+hi def link sedDelete		Function
+hi def link sedError		Error
+hi def link sedFlag		Type
+hi def link sedFlagwrite		Constant
+hi def link sedFunction		Function
+hi def link sedLabel		Label
+hi def link sedLineCont		Special
+hi def link sedPutHoldspc	Function
+hi def link sedReplaceMeta	Special
+hi def link sedRegexpMeta	Special
+hi def link sedRW		Constant
+hi def link sedSemicolon		Special
+hi def link sedST		Function
+hi def link sedSpecial		Special
+hi def link sedWhitespace	NONE
 if exists("highlight_sedtabs")
-HiLink sedTab		Todo
+hi def link sedTab		Todo
 endif
 let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64
 while __sed_i <= __sed_last
-exe "HiLink sedRegexp".__sed_i		"Macro"
-exe "HiLink sedReplacement".__sed_i	"NONE"
+exe "hi def link sedRegexp".__sed_i		"Macro"
+exe "hi def link sedReplacement".__sed_i	"NONE"
 let __sed_i = __sed_i + 1
 endwhile
 
-delcommand HiLink
 
 unlet __sed_i __sed_last __sed_delimiter __sed_metacharacters
 
diff --git a/runtime/syntax/sgmldecl.vim b/runtime/syntax/sgmldecl.vim
--- a/runtime/syntax/sgmldecl.vim
+++ b/runtime/syntax/sgmldecl.vim
@@ -50,21 +50,19 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	sgmldeclDeclKeys	Keyword
-HiLink	sgmldeclTypes		Type
-HiLink	sgmldeclConst		Constant
-HiLink	sgmldeclNConst		Constant
-HiLink	sgmldeclString		String
-HiLink	sgmldeclDeclBlock	Normal
-HiLink	sgmldeclBool		Boolean
-HiLink	sgmldeclSpecial		Special
-HiLink	sgmldeclComment		Comment
-HiLink	sgmldeclStatem		Statement
-HiLink	sgmldeclVariables	Type
+hi def link sgmldeclDeclKeys	Keyword
+hi def link sgmldeclTypes		Type
+hi def link sgmldeclConst		Constant
+hi def link sgmldeclNConst		Constant
+hi def link sgmldeclString		String
+hi def link sgmldeclDeclBlock	Normal
+hi def link sgmldeclBool		Boolean
+hi def link sgmldeclSpecial		Special
+hi def link sgmldeclComment		Comment
+hi def link sgmldeclStatem		Statement
+hi def link sgmldeclVariables	Type
 
-delcommand HiLink
 
 let b:current_syntax = "sgmldecl"
 
diff --git a/runtime/syntax/sgmllnx.vim b/runtime/syntax/sgmllnx.vim
--- a/runtime/syntax/sgmllnx.vim
+++ b/runtime/syntax/sgmllnx.vim
@@ -34,22 +34,20 @@ syn region sgmllnxDocType start=+<!docty
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sgmllnxTag2	    Function
-HiLink sgmllnxTagN2	    Function
-HiLink sgmllnxTag	    Special
-HiLink sgmllnxEndTag	    Special
-HiLink sgmllnxParen	    Special
-HiLink sgmllnxEntity	    Type
-HiLink sgmllnxDocEnt	    Type
-HiLink sgmllnxTagName	    Statement
-HiLink sgmllnxComment	    Comment
-HiLink sgmllnxSpecial	    Special
-HiLink sgmllnxDocType	    PreProc
-HiLink sgmllnxTagError    Error
+hi def link sgmllnxTag2	    Function
+hi def link sgmllnxTagN2	    Function
+hi def link sgmllnxTag	    Special
+hi def link sgmllnxEndTag	    Special
+hi def link sgmllnxParen	    Special
+hi def link sgmllnxEntity	    Type
+hi def link sgmllnxDocEnt	    Type
+hi def link sgmllnxTagName	    Statement
+hi def link sgmllnxComment	    Comment
+hi def link sgmllnxSpecial	    Special
+hi def link sgmllnxDocType	    PreProc
+hi def link sgmllnxTagError    Error
 
-delcommand HiLink
 
 let b:current_syntax = "sgmllnx"
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,13 +2,13 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 26, 2016
+" Last Change:		Aug 31, 2016
 " Version:		162
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
-" quit when a syntax file was already loaded
+" quit when a syntax file was already loaded {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -145,7 +145,7 @@ syn cluster shHereBeginList	contains=@sh
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shHereString,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shParen
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
@@ -497,7 +497,7 @@ syn match  shDerefString	contained	"\\["
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':\ze[^-=?+]'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
@@ -573,132 +573,134 @@ syn sync match shWhileSync	grouphere	shR
 
 " Default Highlighting: {{{1
 " =====================
-hi def link shArithRegion	shShellVariables
-hi def link shAstQuote	shDoubleQuote
-hi def link shAtExpr	shSetList
-hi def link shBeginHere	shRedir
-hi def link shCaseBar	shConditional
-hi def link shCaseCommandSub	shCommandSub
-hi def link shCaseDoubleQuote	shDoubleQuote
-hi def link shCaseIn	shConditional
-hi def link shQuote	shOperator
-hi def link shCaseSingleQuote	shSingleQuote
-hi def link shCaseStart	shConditional
-hi def link shCmdSubRegion	shShellVariables
-hi def link shColon	shComment
-hi def link shDerefOp	shOperator
-hi def link shDerefPOL	shDerefOp
-hi def link shDerefPPS	shDerefOp
-hi def link shDerefPSR	shDerefOp
-hi def link shDeref	shShellVariables
-hi def link shDerefDelim	shOperator
-hi def link shDerefSimple	shDeref
-hi def link shDerefSpecial	shDeref
-hi def link shDerefString	shDoubleQuote
-hi def link shDerefVar	shDeref
-hi def link shDoubleQuote	shString
-hi def link shEcho	shString
-hi def link shEchoDelim	shOperator
-hi def link shEchoQuote	shString
-hi def link shForPP	shLoop
-hi def link shFunction	Function
-hi def link shEmbeddedEcho	shString
-hi def link shEscape	shCommandSub
-hi def link shExDoubleQuote	shDoubleQuote
-hi def link shExSingleQuote	shSingleQuote
-hi def link shHereDoc	shString
-hi def link shHereString	shRedir
-hi def link shHerePayload	shHereDoc
-hi def link shLoop	shStatement
-hi def link shSpecialNxt	shSpecial
-hi def link shNoQuote	shDoubleQuote
-hi def link shOption	shCommandSub
-hi def link shPattern	shString
-hi def link shParen	shArithmetic
-hi def link shPosnParm	shShellVariables
-hi def link shQuickComment	shComment
-hi def link shRange	shOperator
-hi def link shRedir	shOperator
-hi def link shSetListDelim	shOperator
-hi def link shSetOption	shOption
-hi def link shSingleQuote	shString
-hi def link shSource	shOperator
-hi def link shStringSpecial	shSpecial
-hi def link shSubShRegion	shOperator
-hi def link shTestOpr	shConditional
-hi def link shTestPattern	shString
-hi def link shTestDoubleQuote	shString
-hi def link shTestSingleQuote	shString
-hi def link shTouchCmd	shStatement
-hi def link shVariable	shSetList
-hi def link shWrapLineOperator	shOperator
+if !exists("skip_sh_syntax_inits")
+ hi def link shArithRegion	shShellVariables
+ hi def link shAstQuote	shDoubleQuote
+ hi def link shAtExpr	shSetList
+ hi def link shBeginHere	shRedir
+ hi def link shCaseBar	shConditional
+ hi def link shCaseCommandSub	shCommandSub
+ hi def link shCaseDoubleQuote	shDoubleQuote
+ hi def link shCaseIn	shConditional
+ hi def link shQuote	shOperator
+ hi def link shCaseSingleQuote	shSingleQuote
+ hi def link shCaseStart	shConditional
+ hi def link shCmdSubRegion	shShellVariables
+ hi def link shColon	shComment
+ hi def link shDerefOp	shOperator
+ hi def link shDerefPOL	shDerefOp
+ hi def link shDerefPPS	shDerefOp
+ hi def link shDerefPSR	shDerefOp
+ hi def link shDeref	shShellVariables
+ hi def link shDerefDelim	shOperator
+ hi def link shDerefSimple	shDeref
+ hi def link shDerefSpecial	shDeref
+ hi def link shDerefString	shDoubleQuote
+ hi def link shDerefVar	shDeref
+ hi def link shDoubleQuote	shString
+ hi def link shEcho	shString
+ hi def link shEchoDelim	shOperator
+ hi def link shEchoQuote	shString
+ hi def link shForPP	shLoop
+ hi def link shFunction	Function
+ hi def link shEmbeddedEcho	shString
+ hi def link shEscape	shCommandSub
+ hi def link shExDoubleQuote	shDoubleQuote
+ hi def link shExSingleQuote	shSingleQuote
+ hi def link shHereDoc	shString
+ hi def link shHereString	shRedir
+ hi def link shHerePayload	shHereDoc
+ hi def link shLoop	shStatement
+ hi def link shSpecialNxt	shSpecial
+ hi def link shNoQuote	shDoubleQuote
+ hi def link shOption	shCommandSub
+ hi def link shPattern	shString
+ hi def link shParen	shArithmetic
+ hi def link shPosnParm	shShellVariables
+ hi def link shQuickComment	shComment
+ hi def link shRange	shOperator
+ hi def link shRedir	shOperator
+ hi def link shSetListDelim	shOperator
+ hi def link shSetOption	shOption
+ hi def link shSingleQuote	shString
+ hi def link shSource	shOperator
+ hi def link shStringSpecial	shSpecial
+ hi def link shSubShRegion	shOperator
+ hi def link shTestOpr	shConditional
+ hi def link shTestPattern	shString
+ hi def link shTestDoubleQuote	shString
+ hi def link shTestSingleQuote	shString
+ hi def link shTouchCmd	shStatement
+ hi def link shVariable	shSetList
+ hi def link shWrapLineOperator	shOperator
 
-if exists("b:is_bash")
-  hi def link bashAdminStatement	shStatement
-  hi def link bashSpecialVariables	shShellVariables
-  hi def link bashStatement		shStatement
-  hi def link shCharClass		shSpecial
-  hi def link shDerefOff		shDerefOp
-  hi def link shDerefLen		shDerefOff
-endif
-if exists("b:is_kornshell")
-  hi def link kshSpecialVariables	shShellVariables
-  hi def link kshStatement		shStatement
-endif
+ if exists("b:is_bash")
+   hi def link bashAdminStatement	shStatement
+   hi def link bashSpecialVariables	shShellVariables
+   hi def link bashStatement		shStatement
+   hi def link shCharClass		shSpecial
+   hi def link shDerefOff		shDerefOp
+   hi def link shDerefLen		shDerefOff
+ endif
+ if exists("b:is_kornshell")
+   hi def link kshSpecialVariables	shShellVariables
+   hi def link kshStatement		shStatement
+ endif
 
-if !exists("g:sh_no_error")
- hi def link shCaseError		Error
- hi def link shCondError		Error
- hi def link shCurlyError		Error
- hi def link shDerefOpError		Error
- hi def link shDerefWordError		Error
- hi def link shDoError		Error
- hi def link shEsacError		Error
- hi def link shIfError		Error
- hi def link shInError		Error
- hi def link shParenError		Error
- hi def link shTestError		Error
- if exists("b:is_kornshell")
-   hi def link shDTestError		Error
+ if !exists("g:sh_no_error")
+  hi def link shCaseError		Error
+  hi def link shCondError		Error
+  hi def link shCurlyError		Error
+  hi def link shDerefOpError		Error
+  hi def link shDerefWordError		Error
+  hi def link shDoError		Error
+  hi def link shEsacError		Error
+  hi def link shIfError		Error
+  hi def link shInError		Error
+  hi def link shParenError		Error
+  hi def link shTestError		Error
+  if exists("b:is_kornshell")
+    hi def link shDTestError		Error
+  endif
  endif
-endif
 
-hi def link shArithmetic		Special
-hi def link shCharClass		Identifier
-hi def link shSnglCase		Statement
-hi def link shCommandSub		Special
-hi def link shComment		Comment
-hi def link shConditional		Conditional
-hi def link shCtrlSeq		Special
-hi def link shExprRegion		Delimiter
-hi def link shFunctionKey		Function
-hi def link shFunctionName		Function
-hi def link shNumber		Number
-hi def link shOperator		Operator
-hi def link shRepeat		Repeat
-hi def link shSet		Statement
-hi def link shSetList		Identifier
-hi def link shShellVariables		PreProc
-hi def link shSpecial		Special
-hi def link shStatement		Statement
-hi def link shString		String
-hi def link shTodo		Todo
-hi def link shAlias		Identifier
-hi def link shHereDoc01		shRedir
-hi def link shHereDoc02		shRedir
-hi def link shHereDoc03		shRedir
-hi def link shHereDoc04		shRedir
-hi def link shHereDoc05		shRedir
-hi def link shHereDoc06		shRedir
-hi def link shHereDoc07		shRedir
-hi def link shHereDoc08		shRedir
-hi def link shHereDoc09		shRedir
-hi def link shHereDoc10		shRedir
-hi def link shHereDoc11		shRedir
-hi def link shHereDoc12		shRedir
-hi def link shHereDoc13		shRedir
-hi def link shHereDoc14		shRedir
-hi def link shHereDoc15		shRedir
+ hi def link shArithmetic		Special
+ hi def link shCharClass		Identifier
+ hi def link shSnglCase		Statement
+ hi def link shCommandSub		Special
+ hi def link shComment		Comment
+ hi def link shConditional		Conditional
+ hi def link shCtrlSeq		Special
+ hi def link shExprRegion		Delimiter
+ hi def link shFunctionKey		Function
+ hi def link shFunctionName		Function
+ hi def link shNumber		Number
+ hi def link shOperator		Operator
+ hi def link shRepeat		Repeat
+ hi def link shSet		Statement
+ hi def link shSetList		Identifier
+ hi def link shShellVariables		PreProc
+ hi def link shSpecial		Special
+ hi def link shStatement		Statement
+ hi def link shString		String
+ hi def link shTodo		Todo
+ hi def link shAlias		Identifier
+ hi def link shHereDoc01		shRedir
+ hi def link shHereDoc02		shRedir
+ hi def link shHereDoc03		shRedir
+ hi def link shHereDoc04		shRedir
+ hi def link shHereDoc05		shRedir
+ hi def link shHereDoc06		shRedir
+ hi def link shHereDoc07		shRedir
+ hi def link shHereDoc08		shRedir
+ hi def link shHereDoc09		shRedir
+ hi def link shHereDoc10		shRedir
+ hi def link shHereDoc11		shRedir
+ hi def link shHereDoc12		shRedir
+ hi def link shHereDoc13		shRedir
+ hi def link shHereDoc14		shRedir
+ hi def link shHereDoc15		shRedir
+endif
 
 " Delete shell folding commands {{{1
 " =============================
diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim
--- a/runtime/syntax/sicad.vim
+++ b/runtime/syntax/sicad.vim
@@ -359,33 +359,31 @@ syn keyword sicadStatement zparp zparpn 
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sicadLabel PreProc
-HiLink sicadLabel1 sicadLabel
-HiLink sicadLabel2 sicadLabel
-HiLink sicadConditional Conditional
-HiLink sicadBoolean Boolean
-HiLink sicadNumber Number
-HiLink sicadFloat Float
-HiLink sicadOperator Operator
-HiLink sicadStatement Statement
-HiLink sicadParameter sicadStatement
-HiLink sicadGoto sicadStatement
-HiLink sicadLineCont sicadStatement
-HiLink sicadString String
-HiLink sicadComment Comment
-HiLink sicadSpecial Special
-HiLink sicadIdentifier Type
-"  HiLink sicadIdentifier Identifier
-HiLink sicadError Error
-HiLink sicadParenError sicadError
-HiLink sicadApostropheError sicadError
-HiLink sicadStringError sicadError
-HiLink sicadCommentError sicadError
-"  HiLink sqlStatement Special  " modified highlight group in sql.vim
+hi def link sicadLabel PreProc
+hi def link sicadLabel1 sicadLabel
+hi def link sicadLabel2 sicadLabel
+hi def link sicadConditional Conditional
+hi def link sicadBoolean Boolean
+hi def link sicadNumber Number
+hi def link sicadFloat Float
+hi def link sicadOperator Operator
+hi def link sicadStatement Statement
+hi def link sicadParameter sicadStatement
+hi def link sicadGoto sicadStatement
+hi def link sicadLineCont sicadStatement
+hi def link sicadString String
+hi def link sicadComment Comment
+hi def link sicadSpecial Special
+hi def link sicadIdentifier Type
+"  hi def link sicadIdentifier Identifier
+hi def link sicadError Error
+hi def link sicadParenError sicadError
+hi def link sicadApostropheError sicadError
+hi def link sicadStringError sicadError
+hi def link sicadCommentError sicadError
+"  hi def link sqlStatement Special  " modified highlight group in sql.vim
 
-delcommand HiLink
 
 let b:current_syntax = "sicad"
 
diff --git a/runtime/syntax/simula.vim b/runtime/syntax/simula.vim
--- a/runtime/syntax/simula.vim
+++ b/runtime/syntax/simula.vim
@@ -55,35 +55,33 @@ syn match	simulaReal		"-\=\<\d\+\(\.\d\+
 " Real starting with a `.', optional exponent
 syn match	simulaReal		"-\=\.\d\+\(&&\=[+-]\=\d\+\)\=\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink simulaAssigned		Identifier
-HiLink simulaBoolean		Boolean
-HiLink simulaCharacter		Character
-HiLink simulaCharError		Error
-HiLink simulaComment		Comment
-HiLink simulaCompound		Statement
-HiLink simulaConditional		Conditional
-HiLink simulaConstant		Constant
-HiLink simulaFunction		Function
-HiLink simulaNumber			Number
-HiLink simulaOperator		Operator
-HiLink simulaReal			Float
-HiLink simulaReferenceType		Type
-HiLink simulaRepeat			Repeat
-HiLink simulaReserved		Error
-HiLink simulaSemicolon		Statement
-HiLink simulaSpecial		Special
-HiLink simulaSpecialChar		SpecialChar
-HiLink simulaSpecialCharErr		Error
-HiLink simulaStatement		Statement
-HiLink simulaStorageClass		StorageClass
-HiLink simulaString			String
-HiLink simulaStructure		Structure
-HiLink simulaTodo			Todo
-HiLink simulaType			Type
+hi def link simulaAssigned		Identifier
+hi def link simulaBoolean		Boolean
+hi def link simulaCharacter		Character
+hi def link simulaCharError		Error
+hi def link simulaComment		Comment
+hi def link simulaCompound		Statement
+hi def link simulaConditional		Conditional
+hi def link simulaConstant		Constant
+hi def link simulaFunction		Function
+hi def link simulaNumber			Number
+hi def link simulaOperator		Operator
+hi def link simulaReal			Float
+hi def link simulaReferenceType		Type
+hi def link simulaRepeat			Repeat
+hi def link simulaReserved		Error
+hi def link simulaSemicolon		Statement
+hi def link simulaSpecial		Special
+hi def link simulaSpecialChar		SpecialChar
+hi def link simulaSpecialCharErr		Error
+hi def link simulaStatement		Statement
+hi def link simulaStorageClass		StorageClass
+hi def link simulaString			String
+hi def link simulaStructure		Structure
+hi def link simulaTodo			Todo
+hi def link simulaType			Type
 
-delcommand HiLink
 
 let b:current_syntax = "simula"
 " vim: sts=4 sw=4 ts=8
diff --git a/runtime/syntax/sinda.vim b/runtime/syntax/sinda.vim
--- a/runtime/syntax/sinda.vim
+++ b/runtime/syntax/sinda.vim
@@ -100,30 +100,28 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindaMacro		Macro
-HiLink sindaOptions		Special
-HiLink sindaRoutine		Type
-HiLink sindaControl		Special
-HiLink sindaSubRoutine	Function
-HiLink sindaIdentifier	Identifier
+hi def link sindaMacro		Macro
+hi def link sindaOptions		Special
+hi def link sindaRoutine		Type
+hi def link sindaControl		Special
+hi def link sindaSubRoutine	Function
+hi def link sindaIdentifier	Identifier
 
-HiLink sindaFortran		PreProc
-HiLink sindaMotran		PreProc
+hi def link sindaFortran		PreProc
+hi def link sindaMotran		PreProc
 
-HiLink sindaComment		Comment
-HiLink sindaHeader		Typedef
-HiLink sindaIncludeFile	Type
-HiLink sindaInteger		Number
-HiLink sindaFloat		Float
-HiLink sindaScientific	Float
+hi def link sindaComment		Comment
+hi def link sindaHeader		Typedef
+hi def link sindaIncludeFile	Type
+hi def link sindaInteger		Number
+hi def link sindaFloat		Float
+hi def link sindaScientific	Float
 
-HiLink sindaEndData		Macro
+hi def link sindaEndData		Macro
 
-HiLink sindaTodo		Todo
+hi def link sindaTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "sinda"
diff --git a/runtime/syntax/sindacmp.vim b/runtime/syntax/sindacmp.vim
--- a/runtime/syntax/sindacmp.vim
+++ b/runtime/syntax/sindacmp.vim
@@ -43,19 +43,17 @@ syn match  sindacmpFloat       "-\=\<[0-
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindacmpTitle		     Type
-HiLink sindacmpUnit		     PreProc
+hi def link sindacmpTitle		     Type
+hi def link sindacmpUnit		     PreProc
 
-HiLink sindacmpLabel		     Statement
+hi def link sindacmpLabel		     Statement
 
-HiLink sindacmpHeader		     sindaHeader
+hi def link sindacmpHeader		     sindaHeader
 
-HiLink sindacmpInteger	     Number
-HiLink sindacmpFloat		     Special
+hi def link sindacmpInteger	     Number
+hi def link sindacmpFloat		     Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindacmp"
diff --git a/runtime/syntax/sindaout.vim b/runtime/syntax/sindaout.vim
--- a/runtime/syntax/sindaout.vim
+++ b/runtime/syntax/sindaout.vim
@@ -60,24 +60,22 @@ syn match sindaoutError		"<<< Error >>>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi sindaHeaderDelim  ctermfg=Black ctermbg=Green	       guifg=Black guibg=Green
 
-HiLink sindaoutPos		     Statement
-HiLink sindaoutNeg		     PreProc
-HiLink sindaoutTitle		     Type
-HiLink sindaoutFile		     sindaIncludeFile
-HiLink sindaoutInteger	     sindaInteger
+hi def link sindaoutPos		     Statement
+hi def link sindaoutNeg		     PreProc
+hi def link sindaoutTitle		     Type
+hi def link sindaoutFile		     sindaIncludeFile
+hi def link sindaoutInteger	     sindaInteger
 
-HiLink sindaoutSectionDelim	      Delimiter
-HiLink sindaoutSectionTitle	     Exception
-HiLink sindaoutHeaderDelim	     SpecialComment
-HiLink sindaoutLabel		     Identifier
+hi def link sindaoutSectionDelim	      Delimiter
+hi def link sindaoutSectionTitle	     Exception
+hi def link sindaoutHeaderDelim	     SpecialComment
+hi def link sindaoutLabel		     Identifier
 
-HiLink sindaoutError		     Error
+hi def link sindaoutError		     Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindaout"
diff --git a/runtime/syntax/skill.vim b/runtime/syntax/skill.vim
--- a/runtime/syntax/skill.vim
+++ b/runtime/syntax/skill.vim
@@ -523,28 +523,26 @@ syn sync ccomment skillComment minlines=
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink skillcdfFunctions	Function
-HiLink skillgeFunctions		Function
-HiLink skillhiFunctions		Function
-HiLink skillleFunctions		Function
-HiLink skilldbefFunctions	Function
-HiLink skillddFunctions		Function
-HiLink skillpcFunctions		Function
-HiLink skilltechFunctions	Function
-HiLink skillConstants		Constant
-HiLink skillFunction		Function
-HiLink skillKeywords		Statement
-HiLink skillConditional		Conditional
-HiLink skillRepeat			Repeat
-HiLink skillString			String
-HiLink skillTodo			Todo
-HiLink skillNote			Todo
-HiLink skillComment			Comment
-HiLink skillCommentError	Error
+hi def link skillcdfFunctions	Function
+hi def link skillgeFunctions		Function
+hi def link skillhiFunctions		Function
+hi def link skillleFunctions		Function
+hi def link skilldbefFunctions	Function
+hi def link skillddFunctions		Function
+hi def link skillpcFunctions		Function
+hi def link skilltechFunctions	Function
+hi def link skillConstants		Constant
+hi def link skillFunction		Function
+hi def link skillKeywords		Statement
+hi def link skillConditional		Conditional
+hi def link skillRepeat			Repeat
+hi def link skillString			String
+hi def link skillTodo			Todo
+hi def link skillNote			Todo
+hi def link skillComment			Comment
+hi def link skillCommentError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "skill"
 
diff --git a/runtime/syntax/sl.vim b/runtime/syntax/sl.vim
--- a/runtime/syntax/sl.vim
+++ b/runtime/syntax/sl.vim
@@ -73,36 +73,34 @@ syn sync ccomment slComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slLabel	Label
-HiLink slUserLabel	Label
-HiLink slConditional	Conditional
-HiLink slRepeat	Repeat
-HiLink slCharacter	Character
-HiLink slSpecialCharacter slSpecial
-HiLink slNumber	Number
-HiLink slFloat	Float
-HiLink slParenError	slError
-HiLink slInParen	slError
-HiLink slCommentError	slError
-HiLink slOperator	Operator
-HiLink slStorageClass	StorageClass
-HiLink slError	Error
-HiLink slStatement	Statement
-HiLink slType		Type
-HiLink slCommentError	slError
-HiLink slCommentString slString
-HiLink slComment2String slString
-HiLink slCommentSkip	slComment
-HiLink slString	String
-HiLink slComment	Comment
-HiLink slSpecial	SpecialChar
-HiLink slTodo	Todo
-HiLink slVariable	Identifier
-"HiLink slIdentifier	Identifier
+hi def link slLabel	Label
+hi def link slUserLabel	Label
+hi def link slConditional	Conditional
+hi def link slRepeat	Repeat
+hi def link slCharacter	Character
+hi def link slSpecialCharacter slSpecial
+hi def link slNumber	Number
+hi def link slFloat	Float
+hi def link slParenError	slError
+hi def link slInParen	slError
+hi def link slCommentError	slError
+hi def link slOperator	Operator
+hi def link slStorageClass	StorageClass
+hi def link slError	Error
+hi def link slStatement	Statement
+hi def link slType		Type
+hi def link slCommentError	slError
+hi def link slCommentString slString
+hi def link slComment2String slString
+hi def link slCommentSkip	slComment
+hi def link slString	String
+hi def link slComment	Comment
+hi def link slSpecial	SpecialChar
+hi def link slTodo	Todo
+hi def link slVariable	Identifier
+"hi def link slIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "sl"
 
diff --git a/runtime/syntax/slang.vim b/runtime/syntax/slang.vim
--- a/runtime/syntax/slang.vim
+++ b/runtime/syntax/slang.vim
@@ -53,38 +53,36 @@ syn region slangPreCondit start="^\s*#\s
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slangDefinition	Type
-HiLink slangBlock		slangDefinition
-HiLink slangLabel		Label
-HiLink slangConditional	Conditional
-HiLink slangRepeat		Repeat
-HiLink slangCharacter	Character
-HiLink slangFloat		Float
-HiLink slangImaginary	Float
-HiLink slangDecimal		slangNumber
-HiLink slangOctal		slangNumber
-HiLink slangHex		slangNumber
-HiLink slangNumber		Number
-HiLink slangParenError	Error
-HiLink slangOctalError	Error
-HiLink slangOperator		Operator
-HiLink slangStructure	Structure
-HiLink slangInclude		Include
-HiLink slangPreCondit	PreCondit
-HiLink slangError		Error
-HiLink slangStatement	Statement
-HiLink slangType		Type
-HiLink slangString		String
-HiLink slangConstant		Constant
-HiLink slangRangeArray	slangConstant
-HiLink slangComment		Comment
-HiLink slangSpecial		SpecialChar
-HiLink slangTodo		Todo
-HiLink slangDelim		Delimiter
+hi def link slangDefinition	Type
+hi def link slangBlock		slangDefinition
+hi def link slangLabel		Label
+hi def link slangConditional	Conditional
+hi def link slangRepeat		Repeat
+hi def link slangCharacter	Character
+hi def link slangFloat		Float
+hi def link slangImaginary	Float
+hi def link slangDecimal		slangNumber
+hi def link slangOctal		slangNumber
+hi def link slangHex		slangNumber
+hi def link slangNumber		Number
+hi def link slangParenError	Error
+hi def link slangOctalError	Error
+hi def link slangOperator		Operator
+hi def link slangStructure	Structure
+hi def link slangInclude		Include
+hi def link slangPreCondit	PreCondit
+hi def link slangError		Error
+hi def link slangStatement	Statement
+hi def link slangType		Type
+hi def link slangString		String
+hi def link slangConstant		Constant
+hi def link slangRangeArray	slangConstant
+hi def link slangComment		Comment
+hi def link slangSpecial		SpecialChar
+hi def link slangTodo		Todo
+hi def link slangDelim		Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "slang"
 
diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim
--- a/runtime/syntax/slice.vim
+++ b/runtime/syntax/slice.vim
@@ -56,24 +56,22 @@ syn sync ccomment sliceComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sliceComment	Comment
-HiLink sliceConstruct	Keyword
-HiLink sliceType	Type
-HiLink sliceString	String
-HiLink sliceIncluded	String
-HiLink sliceQualifier	Keyword
-HiLink sliceInclude	Include
-HiLink sliceGuard	PreProc
-HiLink sliceBoolean	Boolean
-HiLink sliceFloat	Number
-HiLink sliceNumber	Number
-HiLink sliceOctal	Number
-HiLink sliceOctalZero	Special
-HiLink sliceNumberError Special
+hi def link sliceComment	Comment
+hi def link sliceConstruct	Keyword
+hi def link sliceType	Type
+hi def link sliceString	String
+hi def link sliceIncluded	String
+hi def link sliceQualifier	Keyword
+hi def link sliceInclude	Include
+hi def link sliceGuard	PreProc
+hi def link sliceBoolean	Boolean
+hi def link sliceFloat	Number
+hi def link sliceNumber	Number
+hi def link sliceOctal	Number
+hi def link sliceOctalZero	Special
+hi def link sliceNumberError Special
 
-delcommand HiLink
 
 let b:current_syntax = "slice"
 
diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim
--- a/runtime/syntax/slrnrc.vim
+++ b/runtime/syntax/slrnrc.vim
@@ -148,35 +148,33 @@ syn match   slrnrcUnsetkey	'^\s*unsetkey
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slrnrcTodo		Todo
-HiLink slrnrcSpaceError	Error
-HiLink slrnrcNumber		Number
-HiLink slrnrcSpecKey		SpecialChar
-HiLink slrnrcKey		String
-HiLink slrnrcSpecChar		SpecialChar
-HiLink slrnrcString		String
-HiLink slrnSlangPreCondit	Special
-HiLink slrnrcComment		Comment
-HiLink slrnrcVarInt		Identifier
-HiLink slrnrcVarStr		Identifier
-HiLink slrnrcCmd		slrnrcSet
-HiLink slrnrcSet		Operator
-HiLink slrnrcColor		Keyword
-HiLink slrnrcColorObj		Identifier
-HiLink slrnrcColorVal		String
-HiLink slrnrcMono		Keyword
-HiLink slrnrcMonoObj		Identifier
-HiLink slrnrcMonoVal		String
-HiLink slrnrcFunArt		Macro
-HiLink slrnrcFunGroup		Macro
-HiLink slrnrcFunRead		Macro
-HiLink slrnrcSetkeyObj	Identifier
-HiLink slrnrcSetkey		Keyword
-HiLink slrnrcUnsetkey		slrnrcSetkey
+hi def link slrnrcTodo		Todo
+hi def link slrnrcSpaceError	Error
+hi def link slrnrcNumber		Number
+hi def link slrnrcSpecKey		SpecialChar
+hi def link slrnrcKey		String
+hi def link slrnrcSpecChar		SpecialChar
+hi def link slrnrcString		String
+hi def link slrnSlangPreCondit	Special
+hi def link slrnrcComment		Comment
+hi def link slrnrcVarInt		Identifier
+hi def link slrnrcVarStr		Identifier
+hi def link slrnrcCmd		slrnrcSet
+hi def link slrnrcSet		Operator
+hi def link slrnrcColor		Keyword
+hi def link slrnrcColorObj		Identifier
+hi def link slrnrcColorVal		String
+hi def link slrnrcMono		Keyword
+hi def link slrnrcMonoObj		Identifier
+hi def link slrnrcMonoVal		String
+hi def link slrnrcFunArt		Macro
+hi def link slrnrcFunGroup		Macro
+hi def link slrnrcFunRead		Macro
+hi def link slrnrcSetkeyObj	Identifier
+hi def link slrnrcSetkey		Keyword
+hi def link slrnrcUnsetkey		slrnrcSetkey
 
-delcommand HiLink
 
 let b:current_syntax = "slrnrc"
 
diff --git a/runtime/syntax/slrnsc.vim b/runtime/syntax/slrnsc.vim
--- a/runtime/syntax/slrnsc.vim
+++ b/runtime/syntax/slrnsc.vim
@@ -45,25 +45,23 @@ syn match slrnScoreLine		"^\s*Score::\=\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slrnscComment		Comment
-HiLink slrnscSectionCom	slrnscComment
-HiLink slrnscGroup		String
-HiLink slrnscNumber		Number
-HiLink slrnscDate		Special
-HiLink slrnscDelim		Delimiter
-HiLink slrnscComma		SpecialChar
-HiLink slrnscOper		SpecialChar
-HiLink slrnscEsc		String
-HiLink slrnscSectionStd	Type
-HiLink slrnscSectionNot	Delimiter
-HiLink slrnscItem		Statement
-HiLink slrnscScore		Keyword
-HiLink slrnscScoreIdent	Identifier
-HiLink slrnscInclude		Keyword
+hi def link slrnscComment		Comment
+hi def link slrnscSectionCom	slrnscComment
+hi def link slrnscGroup		String
+hi def link slrnscNumber		Number
+hi def link slrnscDate		Special
+hi def link slrnscDelim		Delimiter
+hi def link slrnscComma		SpecialChar
+hi def link slrnscOper		SpecialChar
+hi def link slrnscEsc		String
+hi def link slrnscSectionStd	Type
+hi def link slrnscSectionNot	Delimiter
+hi def link slrnscItem		Statement
+hi def link slrnscScore		Keyword
+hi def link slrnscScoreIdent	Identifier
+hi def link slrnscInclude		Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "slrnsc"
 
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -57,27 +57,25 @@ syn region smClause	matchgroup=Delimiter
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smClause	Special
-HiLink smClauseError	Error
-HiLink smComment	Comment
-HiLink smDefine	Statement
-HiLink smElse		Delimiter
-HiLink smHeader	Statement
-HiLink smHeaderSep	String
-HiLink smMesg		Special
-HiLink smPrecedence	Number
-HiLink smRewrite	Statement
-HiLink smRewriteComment	Comment
-HiLink smRewriteLhsToken	String
-HiLink smRewriteLhsUser	Statement
-HiLink smRewriteRhsToken	String
-HiLink smRuleset	Preproc
-HiLink smTrusted	Special
-HiLink smVar		String
+hi def link smClause	Special
+hi def link smClauseError	Error
+hi def link smComment	Comment
+hi def link smDefine	Statement
+hi def link smElse		Delimiter
+hi def link smHeader	Statement
+hi def link smHeaderSep	String
+hi def link smMesg		Special
+hi def link smPrecedence	Number
+hi def link smRewrite	Statement
+hi def link smRewriteComment	Comment
+hi def link smRewriteLhsToken	String
+hi def link smRewriteLhsUser	Statement
+hi def link smRewriteRhsToken	String
+hi def link smRuleset	Preproc
+hi def link smTrusted	Special
+hi def link smVar		String
 
-delcommand HiLink
 
 let b:current_syntax = "sm"
 
diff --git a/runtime/syntax/smarty.vim b/runtime/syntax/smarty.vim
--- a/runtime/syntax/smarty.vim
+++ b/runtime/syntax/smarty.vim
@@ -56,18 +56,16 @@ syn region  htmlString   contained start
   syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smartyTagName Identifier
-HiLink smartyProperty Constant
+hi def link smartyTagName Identifier
+hi def link smartyProperty Constant
 " if you want the text inside the braces to be colored, then
 " remove the comment in from of the next statement
-"HiLink smartyZone Include
-HiLink smartyInFunc Function
-HiLink smartyBlock Constant
-HiLink smartyDot SpecialChar
-HiLink smartyModifier Function
-delcommand HiLink
+"hi def link smartyZone Include
+hi def link smartyInFunc Function
+hi def link smartyBlock Constant
+hi def link smartyDot SpecialChar
+hi def link smartyModifier Function
 
 let b:current_syntax = "smarty"
 
diff --git a/runtime/syntax/smil.vim b/runtime/syntax/smil.vim
--- a/runtime/syntax/smil.vim
+++ b/runtime/syntax/smil.vim
@@ -113,29 +113,27 @@ syn region smilComment		      start=+<!D
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smilTag			Function
-HiLink smilEndTag			Identifier
-HiLink smilArg			Type
-HiLink smilTagName			smilStatement
-HiLink smilSpecialTagName		Exception
-HiLink smilValue			Value
-HiLink smilSpecialChar		Special
+hi def link smilTag			Function
+hi def link smilEndTag			Identifier
+hi def link smilArg			Type
+hi def link smilTagName			smilStatement
+hi def link smilSpecialTagName		Exception
+hi def link smilValue			Value
+hi def link smilSpecialChar		Special
 
-HiLink smilSpecial			Special
-HiLink smilSpecialChar		Special
-HiLink smilString			String
-HiLink smilStatement			Statement
-HiLink smilComment			Comment
-HiLink smilCommentPart		Comment
-HiLink smilPreProc			PreProc
-HiLink smilValue			String
-HiLink smilCommentError		smilError
-HiLink smilTagError			smilError
-HiLink smilError			Error
+hi def link smilSpecial			Special
+hi def link smilSpecialChar		Special
+hi def link smilString			String
+hi def link smilStatement			Statement
+hi def link smilComment			Comment
+hi def link smilCommentPart		Comment
+hi def link smilPreProc			PreProc
+hi def link smilValue			String
+hi def link smilCommentError		smilError
+hi def link smilTagError			smilError
+hi def link smilError			Error
 
-delcommand HiLink
 
 let b:current_syntax = "smil"
 
diff --git a/runtime/syntax/smith.vim b/runtime/syntax/smith.vim
--- a/runtime/syntax/smith.vim
+++ b/runtime/syntax/smith.vim
@@ -26,15 +26,13 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smithRegister	Identifier
-HiLink smithKeyword	Keyword
-HiLink smithComment Comment
-HiLink smithString String
-HiLink smithNumber	Number
+hi def link smithRegister	Identifier
+hi def link smithKeyword	Keyword
+hi def link smithComment Comment
+hi def link smithString String
+hi def link smithNumber	Number
 
-delcommand HiLink
 
 let b:current_syntax = "smith"
 
diff --git a/runtime/syntax/sml.vim b/runtime/syntax/sml.vim
--- a/runtime/syntax/sml.vim
+++ b/runtime/syntax/sml.vim
@@ -166,53 +166,51 @@ syn sync match smlSigSync     groupthere
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smlBraceErr	 Error
-HiLink smlBrackErr	 Error
-HiLink smlParenErr	 Error
+hi def link smlBraceErr	 Error
+hi def link smlBrackErr	 Error
+hi def link smlParenErr	 Error
+
+hi def link smlCommentErr	 Error
 
-HiLink smlCommentErr	 Error
+hi def link smlEndErr	 Error
+hi def link smlThenErr	 Error
 
-HiLink smlEndErr	 Error
-HiLink smlThenErr	 Error
+hi def link smlCharErr	 Error
 
-HiLink smlCharErr	 Error
-
-HiLink smlComment	 Comment
+hi def link smlComment	 Comment
 
-HiLink smlModPath	 Include
-HiLink smlModule	 Include
-HiLink smlModParam1	 Include
-HiLink smlModType	 Include
-HiLink smlMPRestr3	 Include
-HiLink smlFullMod	 Include
-HiLink smlModTypeRestr Include
-HiLink smlWith	 Include
-HiLink smlMTDef	 Include
+hi def link smlModPath	 Include
+hi def link smlModule	 Include
+hi def link smlModParam1	 Include
+hi def link smlModType	 Include
+hi def link smlMPRestr3	 Include
+hi def link smlFullMod	 Include
+hi def link smlModTypeRestr Include
+hi def link smlWith	 Include
+hi def link smlMTDef	 Include
 
-HiLink smlConstructor  Constant
+hi def link smlConstructor  Constant
 
-HiLink smlModPreRHS	 Keyword
-HiLink smlMPRestr2	 Keyword
-HiLink smlKeyword	 Keyword
-HiLink smlFunDef	 Keyword
-HiLink smlRefAssign	 Keyword
-HiLink smlKeyChar	 Keyword
-HiLink smlAnyVar	 Keyword
-HiLink smlTopStop	 Keyword
-HiLink smlOperator	 Keyword
+hi def link smlModPreRHS	 Keyword
+hi def link smlMPRestr2	 Keyword
+hi def link smlKeyword	 Keyword
+hi def link smlFunDef	 Keyword
+hi def link smlRefAssign	 Keyword
+hi def link smlKeyChar	 Keyword
+hi def link smlAnyVar	 Keyword
+hi def link smlTopStop	 Keyword
+hi def link smlOperator	 Keyword
 
-HiLink smlBoolean	 Boolean
-HiLink smlCharacter	 Character
-HiLink smlNumber	 Number
-HiLink smlReal	 Float
-HiLink smlString	 String
-HiLink smlType	 Type
-HiLink smlTodo	 Todo
-HiLink smlEncl	 Keyword
+hi def link smlBoolean	 Boolean
+hi def link smlCharacter	 Character
+hi def link smlNumber	 Number
+hi def link smlReal	 Float
+hi def link smlString	 String
+hi def link smlType	 Type
+hi def link smlTodo	 Todo
+hi def link smlEncl	 Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "sml"
 
diff --git a/runtime/syntax/snnsnet.vim b/runtime/syntax/snnsnet.vim
--- a/runtime/syntax/snnsnet.vim
+++ b/runtime/syntax/snnsnet.vim
@@ -53,16 +53,14 @@ syn match	snnsnetNumbers	"\d" contained
 syn match	snnsnetComment	"#.*$" contains=snnsnetTodo
 syn keyword	snnsnetTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsnetType		Type
-HiLink snnsnetComment		Comment
-HiLink snnsnetNumbers		Number
-HiLink snnsnetSection		Statement
-HiLink snnsnetTitle		Label
-HiLink snnsnetTodo		Todo
+hi def link snnsnetType		Type
+hi def link snnsnetComment		Comment
+hi def link snnsnetNumbers		Number
+hi def link snnsnetSection		Statement
+hi def link snnsnetTitle		Label
+hi def link snnsnetTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsnet"
 
diff --git a/runtime/syntax/snnspat.vim b/runtime/syntax/snnspat.vim
--- a/runtime/syntax/snnspat.vim
+++ b/runtime/syntax/snnspat.vim
@@ -43,19 +43,17 @@ syn match	snnspatNumbers	"\d" contained
 syn match	snnspatComment	"#.*$" contains=snnspatTodo
 syn keyword	snnspatTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnspatGen		Statement
-HiLink snnspatHeader		Error
-HiLink snnspatNoHeader	Define
-HiLink snnspatNumbers		Number
-HiLink snnspatComment		Comment
-HiLink snnspatError		Error
-HiLink snnspatTodo		Todo
-HiLink snnspatAccepted	NONE
-HiLink snnspatBrac		NONE
+hi def link snnspatGen		Statement
+hi def link snnspatHeader		Error
+hi def link snnspatNoHeader	Define
+hi def link snnspatNumbers		Number
+hi def link snnspatComment		Comment
+hi def link snnspatError		Error
+hi def link snnspatTodo		Todo
+hi def link snnspatAccepted	NONE
+hi def link snnspatBrac		NONE
 
-delcommand HiLink
 
 let b:current_syntax = "snnspat"
 
diff --git a/runtime/syntax/snnsres.vim b/runtime/syntax/snnsres.vim
--- a/runtime/syntax/snnsres.vim
+++ b/runtime/syntax/snnsres.vim
@@ -36,16 +36,14 @@ syn match	snnsresNumbers	"\d" contained
 syn match	snnsresComment	"#.*$" contains=snnsresTodo
 syn keyword	snnsresTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsresGen		Statement
-HiLink snnsresHeader		Statement
-HiLink snnsresNoHeader	Define
-HiLink snnsresNumbers		Number
-HiLink snnsresComment		Comment
-HiLink snnsresTodo		Todo
+hi def link snnsresGen		Statement
+hi def link snnsresHeader		Statement
+hi def link snnsresNoHeader	Define
+hi def link snnsresNumbers		Number
+hi def link snnsresComment		Comment
+hi def link snnsresTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsres"
 
diff --git a/runtime/syntax/snobol4.vim b/runtime/syntax/snobol4.vim
--- a/runtime/syntax/snobol4.vim
+++ b/runtime/syntax/snobol4.vim
@@ -77,38 +77,36 @@ syn match       snobol4ErrInBracket disp
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-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 snobol4BogusStatement  snobol4Error
-HiLink snobol4String          String
-HiLink snobol4Comment         Comment
-HiLink snobol4Special         Special
-HiLink snobol4Todo            Todo
-HiLink snobol4Keyword         Keyword
-HiLink snobol4Function        Function
-HiLink snobol4MathsOperator   Operator
-HiLink snobol4ParenError      snobol4Error
-HiLink snobol4ErrInParen      snobol4Error
-HiLink snobol4ErrInBracket    snobol4Error
-HiLink snobol4SysVar          Keyword
-HiLink snobol4BogusSysVar     snobol4Error
+hi def link snobol4Constant        Constant
+hi def link snobol4Label           Label
+hi def link snobol4Goto            Repeat
+hi def link snobol4Conditional     Conditional
+hi def link snobol4Repeat          Repeat
+hi def link snobol4Number          Number
+hi def link snobol4Error           Error
+hi def link snobol4Statement       PreProc
+hi def link snobol4BogusStatement  snobol4Error
+hi def link snobol4String          String
+hi def link snobol4Comment         Comment
+hi def link snobol4Special         Special
+hi def link snobol4Todo            Todo
+hi def link snobol4Keyword         Keyword
+hi def link snobol4Function        Function
+hi def link snobol4MathsOperator   Operator
+hi def link snobol4ParenError      snobol4Error
+hi def link snobol4ErrInParen      snobol4Error
+hi def link snobol4ErrInBracket    snobol4Error
+hi def link snobol4SysVar          Keyword
+hi def link snobol4BogusSysVar     snobol4Error
 if exists("snobol4_strict_mode")
-HiLink snobol4ExtSysVar       WarningMsg
-HiLink snobol4ExtKeyword      WarningMsg
+hi def link snobol4ExtSysVar       WarningMsg
+hi def link snobol4ExtKeyword      WarningMsg
 else
-HiLink snobol4ExtSysVar       snobol4SysVar
-HiLink snobol4ExtKeyword      snobol4Keyword
+hi def link snobol4ExtSysVar       snobol4SysVar
+hi def link snobol4ExtKeyword      snobol4Keyword
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "snobol4"
 " vim: ts=8
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -157,68 +157,66 @@ syn sync match shCaseEsacSync groupthere
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "main types color definitions
-HiLink specSection			Structure
-HiLink specSectionMacro		Macro
-HiLink specWWWlink			PreProc
-HiLink specOpts			Operator
+hi def link specSection			Structure
+hi def link specSectionMacro		Macro
+hi def link specWWWlink			PreProc
+hi def link specOpts			Operator
 
 "yes, it's ugly, but white is sooo cool
 if &background == "dark"
 hi def specGlobalMacro		ctermfg=white
 else
-HiLink specGlobalMacro		Identifier
+hi def link specGlobalMacro		Identifier
 endif
 
 "sh colors
-HiLink shComment			Comment
-HiLink shIf				Statement
-HiLink shOperator			Special
-HiLink shQuote1			String
-HiLink shQuote2			String
-HiLink shQuoteDelim			Statement
+hi def link shComment			Comment
+hi def link shIf				Statement
+hi def link shOperator			Special
+hi def link shQuote1			String
+hi def link shQuote2			String
+hi def link shQuoteDelim			Statement
 
 "spec colors
-HiLink specBlock			Function
-HiLink specColon			Special
-HiLink specCommand			Statement
-HiLink specCommandOpts		specOpts
-HiLink specCommandSpecial		Special
-HiLink specComment			Comment
-HiLink specConfigure			specCommand
-HiLink specDate			String
-HiLink specDescriptionOpts		specOpts
-HiLink specEmail			specWWWlink
-HiLink specError			Error
-HiLink specFilesDirective		specSectionMacro
-HiLink specFilesOpts			specOpts
-HiLink specLicense			String
-HiLink specMacroNameLocal		specGlobalMacro
-HiLink specMacroNameOther		specGlobalMacro
-HiLink specManpageFile		NONE
-HiLink specMonth			specDate
-HiLink specNoNumberHilite		NONE
-HiLink specNumber			Number
-HiLink specPackageOpts		specOpts
-HiLink specPercent			Special
-HiLink specSpecialChar		Special
-HiLink specSpecialVariables		specGlobalMacro
-HiLink specSpecialVariablesNames	specGlobalMacro
-HiLink specTarCommand			specCommand
-HiLink specURL			specWWWlink
-HiLink specURLMacro			specWWWlink
-HiLink specVariables			Identifier
-HiLink specWeekday			specDate
-HiLink specListedFilesBin		Statement
-HiLink specListedFilesDoc		Statement
-HiLink specListedFilesEtc		Statement
-HiLink specListedFilesLib		Statement
-HiLink specListedFilesPrefix		Statement
-HiLink specListedFilesShare		Statement
+hi def link specBlock			Function
+hi def link specColon			Special
+hi def link specCommand			Statement
+hi def link specCommandOpts		specOpts
+hi def link specCommandSpecial		Special
+hi def link specComment			Comment
+hi def link specConfigure			specCommand
+hi def link specDate			String
+hi def link specDescriptionOpts		specOpts
+hi def link specEmail			specWWWlink
+hi def link specError			Error
+hi def link specFilesDirective		specSectionMacro
+hi def link specFilesOpts			specOpts
+hi def link specLicense			String
+hi def link specMacroNameLocal		specGlobalMacro
+hi def link specMacroNameOther		specGlobalMacro
+hi def link specManpageFile		NONE
+hi def link specMonth			specDate
+hi def link specNoNumberHilite		NONE
+hi def link specNumber			Number
+hi def link specPackageOpts		specOpts
+hi def link specPercent			Special
+hi def link specSpecialChar		Special
+hi def link specSpecialVariables		specGlobalMacro
+hi def link specSpecialVariablesNames	specGlobalMacro
+hi def link specTarCommand			specCommand
+hi def link specURL			specWWWlink
+hi def link specURLMacro			specWWWlink
+hi def link specVariables			Identifier
+hi def link specWeekday			specDate
+hi def link specListedFilesBin		Statement
+hi def link specListedFilesDoc		Statement
+hi def link specListedFilesEtc		Statement
+hi def link specListedFilesLib		Statement
+hi def link specListedFilesPrefix		Statement
+hi def link specListedFilesShare		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "spec"
 
diff --git a/runtime/syntax/specman.vim b/runtime/syntax/specman.vim
--- a/runtime/syntax/specman.vim
+++ b/runtime/syntax/specman.vim
@@ -135,37 +135,35 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink	specmanConditional	Conditional
-HiLink	specmanConstraint	Conditional
-HiLink	specmanRepeat		Repeat
-HiLink	specmanString		String
-HiLink	specmanComment		Comment
-HiLink	specmanConstant		Macro
-HiLink	specmanNumber		Number
-HiLink	specmanCompare		Operator
-HiLink	specmanOperator		Operator
-HiLink	specmanLogical		Operator
-HiLink	specmanStatement	Statement
-HiLink	specmanHDL		SpecialChar
-HiLink	specmanMethod		Function
-HiLink	specmanInclude		Include
-HiLink	specmanStructure	Structure
-HiLink	specmanBoolean		Boolean
-HiLink	specmanFSM		Label
-HiLink	specmanSpecial		Special
-HiLink	specmanType		Type
-HiLink	specmanTemporal		Type
-HiLink	specmanFile		Include
-HiLink	specmanPreCondit	Include
-HiLink	specmanDefine		Typedef
-HiLink	specmanLabel		Label
-HiLink	specmanPacking		keyword
-HiLink	specmanTodo		Todo
-HiLink	specmanParenError	Error
-HiLink	specmanErrInParen	Error
-HiLink	specmanErrInBracket	Error
-delcommand	HiLink
+hi def link specmanConditional	Conditional
+hi def link specmanConstraint	Conditional
+hi def link specmanRepeat		Repeat
+hi def link specmanString		String
+hi def link specmanComment		Comment
+hi def link specmanConstant		Macro
+hi def link specmanNumber		Number
+hi def link specmanCompare		Operator
+hi def link specmanOperator		Operator
+hi def link specmanLogical		Operator
+hi def link specmanStatement	Statement
+hi def link specmanHDL		SpecialChar
+hi def link specmanMethod		Function
+hi def link specmanInclude		Include
+hi def link specmanStructure	Structure
+hi def link specmanBoolean		Boolean
+hi def link specmanFSM		Label
+hi def link specmanSpecial		Special
+hi def link specmanType		Type
+hi def link specmanTemporal		Type
+hi def link specmanFile		Include
+hi def link specmanPreCondit	Include
+hi def link specmanDefine		Typedef
+hi def link specmanLabel		Label
+hi def link specmanPacking		keyword
+hi def link specmanTodo		Todo
+hi def link specmanParenError	Error
+hi def link specmanErrInParen	Error
+hi def link specmanErrInBracket	Error
 
 let b:current_syntax = "specman"
diff --git a/runtime/syntax/spice.vim b/runtime/syntax/spice.vim
--- a/runtime/syntax/spice.vim
+++ b/runtime/syntax/spice.vim
@@ -51,19 +51,17 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink spiceTodo		Todo
-HiLink spiceWrapLineOperator	spiceOperator
-HiLink spiceSinglequote	spiceExpr
-HiLink spiceExpr		Function
-HiLink spiceParenError	Error
-HiLink spiceStatement		Statement
-HiLink spiceNumber		Number
-HiLink spiceComment		Comment
-HiLink spiceOperator		Operator
+hi def link spiceTodo		Todo
+hi def link spiceWrapLineOperator	spiceOperator
+hi def link spiceSinglequote	spiceExpr
+hi def link spiceExpr		Function
+hi def link spiceParenError	Error
+hi def link spiceStatement		Statement
+hi def link spiceNumber		Number
+hi def link spiceComment		Comment
+hi def link spiceOperator		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "spice"
 
diff --git a/runtime/syntax/splint.vim b/runtime/syntax/splint.vim
--- a/runtime/syntax/splint.vim
+++ b/runtime/syntax/splint.vim
@@ -193,52 +193,50 @@ syn cluster	cMultiGroup	add=@splintAllSt
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink splintShortAnn		splintAnnotation
-HiLink splintAnnotation	Comment
-HiLink splintAnnError		splintError
-HiLink splintAnnError2	splintError
-HiLink splintFlag		SpecialComment
-HiLink splintGlobalFlag	splintError
-HiLink splintSpecialAnnot	splintAnnKey
-HiLink splintStateAnnot	splintAnnKey
-HiLink splintSpecTag		splintAnnKey
-HiLink splintModifies		splintAnnKey
-HiLink splintRequires		splintAnnKey
-HiLink splintGlobals		splintAnnKey
-HiLink splintGlobitem		Constant
-HiLink splintGlobannot	splintAnnKey
-HiLink splintWarning		splintAnnKey
-HiLink splintModitem		Constant
-HiLink splintIter		splintAnnKey
-HiLink splintConst		splintAnnKey
-HiLink splintAlt		splintAnnKey
-HiLink splintType		splintAnnKey
-HiLink splintGlobalType	splintAnnKey
-HiLink splintMemMgm		splintAnnKey
-HiLink splintAlias		splintAnnKey
-HiLink splintExposure		splintAnnKey
-HiLink splintDefState		splintAnnKey
-HiLink splintGlobState	splintAnnKey
-HiLink splintNullState	splintAnnKey
-HiLink splintNullPred		splintAnnKey
-HiLink splintExit		splintAnnKey
-HiLink splintExec		splintAnnKey
-HiLink splintSef		splintAnnKey
-HiLink splintDecl		splintAnnKey
-HiLink splintCase		splintAnnKey
-HiLink splintBreak		splintAnnKey
-HiLink splintUnreach		splintAnnKey
-HiLink splintSpecFunc		splintAnnKey
-HiLink splintErrSupp		splintAnnKey
-HiLink splintTypeAcc		splintAnnKey
-HiLink splintMacro		splintAnnKey
-HiLink splintSpecType		splintAnnKey
-HiLink splintAnnKey		Type
-HiLink splintError		Error
+hi def link splintShortAnn		splintAnnotation
+hi def link splintAnnotation	Comment
+hi def link splintAnnError		splintError
+hi def link splintAnnError2	splintError
+hi def link splintFlag		SpecialComment
+hi def link splintGlobalFlag	splintError
+hi def link splintSpecialAnnot	splintAnnKey
+hi def link splintStateAnnot	splintAnnKey
+hi def link splintSpecTag		splintAnnKey
+hi def link splintModifies		splintAnnKey
+hi def link splintRequires		splintAnnKey
+hi def link splintGlobals		splintAnnKey
+hi def link splintGlobitem		Constant
+hi def link splintGlobannot	splintAnnKey
+hi def link splintWarning		splintAnnKey
+hi def link splintModitem		Constant
+hi def link splintIter		splintAnnKey
+hi def link splintConst		splintAnnKey
+hi def link splintAlt		splintAnnKey
+hi def link splintType		splintAnnKey
+hi def link splintGlobalType	splintAnnKey
+hi def link splintMemMgm		splintAnnKey
+hi def link splintAlias		splintAnnKey
+hi def link splintExposure		splintAnnKey
+hi def link splintDefState		splintAnnKey
+hi def link splintGlobState	splintAnnKey
+hi def link splintNullState	splintAnnKey
+hi def link splintNullPred		splintAnnKey
+hi def link splintExit		splintAnnKey
+hi def link splintExec		splintAnnKey
+hi def link splintSef		splintAnnKey
+hi def link splintDecl		splintAnnKey
+hi def link splintCase		splintAnnKey
+hi def link splintBreak		splintAnnKey
+hi def link splintUnreach		splintAnnKey
+hi def link splintSpecFunc		splintAnnKey
+hi def link splintErrSupp		splintAnnKey
+hi def link splintTypeAcc		splintAnnKey
+hi def link splintMacro		splintAnnKey
+hi def link splintSpecType		splintAnnKey
+hi def link splintAnnKey		Type
+hi def link splintError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "splint"
 
diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim
--- a/runtime/syntax/spup.vim
+++ b/runtime/syntax/spup.vim
@@ -204,65 +204,63 @@ syn sync match spupSyncUnit       grouph
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink spupCdi	    spupSection
-HiLink spupConditions   spupSection
-HiLink spupDeclare	    spupSection
-HiLink spupEstimation   spupSection
-HiLink spupExternal	    spupSection
-HiLink spupFlowsheet    spupSection
-HiLink spupFunction	    spupSection
-HiLink spupGlobal	    spupSection
-HiLink spupHomotopy	    spupSection
-HiLink spupMacro	    spupSection
-HiLink spupModel	    spupSection
-HiLink spupOperation    spupSection
-HiLink spupOptions	    spupSection
-HiLink spupProcedure    spupSection
-HiLink spupProfiles	    spupSection
-HiLink spupReport	    spupSection
-HiLink spupTitle	    spupConstant  " this is correct, truly ;)
-HiLink spupUnit	    spupSection
+hi def link spupCdi	    spupSection
+hi def link spupConditions   spupSection
+hi def link spupDeclare	    spupSection
+hi def link spupEstimation   spupSection
+hi def link spupExternal	    spupSection
+hi def link spupFlowsheet    spupSection
+hi def link spupFunction	    spupSection
+hi def link spupGlobal	    spupSection
+hi def link spupHomotopy	    spupSection
+hi def link spupMacro	    spupSection
+hi def link spupModel	    spupSection
+hi def link spupOperation    spupSection
+hi def link spupOptions	    spupSection
+hi def link spupProcedure    spupSection
+hi def link spupProfiles	    spupSection
+hi def link spupReport	    spupSection
+hi def link spupTitle	    spupConstant  " this is correct, truly ;)
+hi def link spupUnit	    spupSection
 
-HiLink spupCdiSubs	      spupSubs
-HiLink spupConditionsSubs spupSubs
-HiLink spupDeclareSubs    spupSubs
-HiLink spupEstimationSubs spupSubs
-HiLink spupExternalSubs   spupSubs
-HiLink spupFlowsheetSubs  spupSubs
-HiLink spupFunctionSubs   spupSubs
-HiLink spupHomotopySubs   spupSubs
-HiLink spupMacroSubs      spupSubs
-HiLink spupModelSubs      spupSubs
-HiLink spupOperationSubs  spupSubs
-HiLink spupOptionsSubs    spupSubs
-HiLink spupProcedureSubs  spupSubs
-HiLink spupReportSubs     spupSubs
-HiLink spupUnitSubs	      spupSubs
+hi def link spupCdiSubs	      spupSubs
+hi def link spupConditionsSubs spupSubs
+hi def link spupDeclareSubs    spupSubs
+hi def link spupEstimationSubs spupSubs
+hi def link spupExternalSubs   spupSubs
+hi def link spupFlowsheetSubs  spupSubs
+hi def link spupFunctionSubs   spupSubs
+hi def link spupHomotopySubs   spupSubs
+hi def link spupMacroSubs      spupSubs
+hi def link spupModelSubs      spupSubs
+hi def link spupOperationSubs  spupSubs
+hi def link spupOptionsSubs    spupSubs
+hi def link spupProcedureSubs  spupSubs
+hi def link spupReportSubs     spupSubs
+hi def link spupUnitSubs	      spupSubs
 
-HiLink spupCode	       Normal
-HiLink spupComment	       Comment
-HiLink spupComment2	       spupComment
-HiLink spupConditional     Statement
-HiLink spupConstant	       Constant
-HiLink spupError	       Error
-HiLink spupHelp	       Normal
-HiLink spupIdentifier      Identifier
-HiLink spupNumber	       Constant
-HiLink spupOperator	       Special
-HiLink spupOpenBrace       spupError
-HiLink spupSection	       Statement
-HiLink spupSpecial	       spupTextprocGeneric
-HiLink spupStreams	       Type
-HiLink spupString	       Constant
-HiLink spupSubs	       Statement
-HiLink spupSymbol	       Special
-HiLink spupTextprocError   Normal
-HiLink spupTextprocGeneric PreProc
-HiLink spupTypes	       Type
+hi def link spupCode	       Normal
+hi def link spupComment	       Comment
+hi def link spupComment2	       spupComment
+hi def link spupConditional     Statement
+hi def link spupConstant	       Constant
+hi def link spupError	       Error
+hi def link spupHelp	       Normal
+hi def link spupIdentifier      Identifier
+hi def link spupNumber	       Constant
+hi def link spupOperator	       Special
+hi def link spupOpenBrace       spupError
+hi def link spupSection	       Statement
+hi def link spupSpecial	       spupTextprocGeneric
+hi def link spupStreams	       Type
+hi def link spupString	       Constant
+hi def link spupSubs	       Statement
+hi def link spupSymbol	       Special
+hi def link spupTextprocError   Normal
+hi def link spupTextprocGeneric PreProc
+hi def link spupTypes	       Type
 
-delcommand HiLink
 
 let b:current_syntax = "spup"
 
diff --git a/runtime/syntax/sqlforms.vim b/runtime/syntax/sqlforms.vim
--- a/runtime/syntax/sqlforms.vim
+++ b/runtime/syntax/sqlforms.vim
@@ -131,23 +131,21 @@ syntax match sqlNumber  "-\=\<[0-9]*\.\=
 
 syntax sync ccomment sqlComment
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sqlComment Comment
-HiLink sqlKeyword Statement
-HiLink sqlNumber Number
-HiLink sqlOperator Statement
-HiLink sqlProcedure Statement
-HiLink sqlFunction Statement
-HiLink sqlSystem Identifier
-HiLink sqlSpecial Special
-HiLink sqlStatement Statement
-HiLink sqlString String
-HiLink sqlType Type
-HiLink sqlCodes Identifier
-HiLink sqlTriggers PreProc
+hi def link sqlComment Comment
+hi def link sqlKeyword Statement
+hi def link sqlNumber Number
+hi def link sqlOperator Statement
+hi def link sqlProcedure Statement
+hi def link sqlFunction Statement
+hi def link sqlSystem Identifier
+hi def link sqlSpecial Special
+hi def link sqlStatement Statement
+hi def link sqlString String
+hi def link sqlType Type
+hi def link sqlCodes Identifier
+hi def link sqlTriggers PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "sqlforms"
 
diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim
--- a/runtime/syntax/sqlinformix.vim
+++ b/runtime/syntax/sqlinformix.vim
@@ -152,34 +152,32 @@ syn keyword sqlTodo TODO FIXME XXX DEBUG
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
 " === Comment syntax group ===
-HiLink sqlComment	Comment
+hi def link sqlComment	Comment
 
 " === Constant syntax group ===
-HiLink sqlNumber	Number
-HiLink sqlBoolean	Boolean
-HiLink sqlString	String
+hi def link sqlNumber	Number
+hi def link sqlBoolean	Boolean
+hi def link sqlString	String
 
 " === Statment syntax group ===
-HiLink sqlStatement	Statement
-HiLink sqlConditional	Conditional
-HiLink sqlRepeat		Repeat
-HiLink sqlKeyword		Keyword
-HiLink sqlOperator	Operator
-HiLink sqlException	Exception
+hi def link sqlStatement	Statement
+hi def link sqlConditional	Conditional
+hi def link sqlRepeat		Repeat
+hi def link sqlKeyword		Keyword
+hi def link sqlOperator	Operator
+hi def link sqlException	Exception
 
 " === Identifier syntax group ===
-HiLink sqlFunction	Function
+hi def link sqlFunction	Function
 
 " === Type syntax group ===
-HiLink sqlType	Type
+hi def link sqlType	Type
 
 " === Todo syntax group ===
-HiLink sqlTodo	Todo
+hi def link sqlTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "sqlinformix"
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -74,20 +74,18 @@ syn match sqlComment	"--.*"
 
 syn sync ccomment sqljComment
 
-command! -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink sqljComment	Comment
-HiLink sqljKeyword	sqljSpecial
-HiLink sqljNumber	Number
-HiLink sqljOperator	sqljStatement
-HiLink sqljSpecial	Special
-HiLink sqljStatement	Statement
-HiLink sqljString	String
-HiLink sqljType	Type
-HiLink sqljPre	PreProc
+hi def link sqljComment	Comment
+hi def link sqljKeyword	sqljSpecial
+hi def link sqljNumber	Number
+hi def link sqljOperator	sqljStatement
+hi def link sqljSpecial	Special
+hi def link sqljStatement	Statement
+hi def link sqljString	String
+hi def link sqljType	Type
+hi def link sqljPre	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "sqlj"
 
diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -128,19 +128,17 @@ syn keyword sqlFunction	xmlparse xmlpatc
 syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
-HiLink Quote            Special
-HiLink sqlComment	Comment
-HiLink sqlFunction	Function
-HiLink sqlKeyword	sqlSpecial
-HiLink sqlNumber	Number
-HiLink sqlOperator	sqlStatement
-HiLink sqlSpecial	Special
-HiLink sqlStatement	Statement
-HiLink sqlString	String
-HiLink sqlType		Type
-HiLink sqlTodo		Todo
+hi def link Quote            Special
+hi def link sqlComment	Comment
+hi def link sqlFunction	Function
+hi def link sqlKeyword	sqlSpecial
+hi def link sqlNumber	Number
+hi def link sqlOperator	sqlStatement
+hi def link sqlSpecial	Special
+hi def link sqlStatement	Statement
+hi def link sqlString	String
+hi def link sqlType		Type
+hi def link sqlTodo		Todo
 
-delcommand HiLink
 let b:current_syntax = "sql"
 " vim: ts=8
diff --git a/runtime/syntax/sqr.vim b/runtime/syntax/sqr.vim
--- a/runtime/syntax/sqr.vim
+++ b/runtime/syntax/sqr.vim
@@ -236,28 +236,26 @@ syn match	sqrError	/.\+\zs!!.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sqrSection Statement
-HiLink sqrParagraph Statement
-HiLink sqrReserved Statement
-HiLink sqrParameter Statement
-HiLink sqrPreProc PreProc
-HiLink sqrSubstVar PreProc
-HiLink sqrCommand Statement
-HiLink sqrParam Type
-HiLink sqrFunction Special
+hi def link sqrSection Statement
+hi def link sqrParagraph Statement
+hi def link sqrReserved Statement
+hi def link sqrParameter Statement
+hi def link sqrPreProc PreProc
+hi def link sqrSubstVar PreProc
+hi def link sqrCommand Statement
+hi def link sqrParam Type
+hi def link sqrFunction Special
 
-HiLink sqrString String
-HiLink sqrStrOpen Todo
-HiLink sqrNumber Number
-HiLink sqrVariable Identifier
+hi def link sqrString String
+hi def link sqrStrOpen Todo
+hi def link sqrNumber Number
+hi def link sqrVariable Identifier
 
-HiLink sqrComment Comment
-HiLink sqrTodo Todo
-HiLink sqrError Error
+hi def link sqrComment Comment
+hi def link sqrTodo Todo
+hi def link sqrError Error
 
-delcommand HiLink
 
 let b:current_syntax = "sqr"
 
diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@@ -121,21 +121,19 @@ syn sync minlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink squidTodo	Todo
-HiLink squidComment	Comment
-HiLink squidTag	Special
-HiLink squidConf	Keyword
-HiLink squidOpt	Constant
-HiLink squidAction	String
-HiLink squidNumber	Number
-HiLink squidIP	Number
-HiLink squidAcl	Keyword
-HiLink squidStr	String
-HiLink squidRegexOpt	Special
+hi def link squidTodo	Todo
+hi def link squidComment	Comment
+hi def link squidTag	Special
+hi def link squidConf	Keyword
+hi def link squidOpt	Constant
+hi def link squidAction	String
+hi def link squidNumber	Number
+hi def link squidIP	Number
+hi def link squidAcl	Keyword
+hi def link squidStr	String
+hi def link squidRegexOpt	Special
 
-delcommand HiLink
 
 let b:current_syntax = "squid"
 
diff --git a/runtime/syntax/srec.vim b/runtime/syntax/srec.vim
--- a/runtime/syntax/srec.vim
+++ b/runtime/syntax/srec.vim
@@ -61,24 +61,22 @@ syn match srecChecksum "[0-9a-fA-F]\{2}$
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink srecRecStart            srecRecType
-HiLink srecRecTypeUnknown      srecRecType
-HiLink srecRecType             WarningMsg
-HiLink srecByteCount           Constant
+hi def link srecRecStart            srecRecType
+hi def link srecRecTypeUnknown      srecRecType
+hi def link srecRecType             WarningMsg
+hi def link srecByteCount           Constant
 hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink srecNoAddress           DiffAdd
-HiLink srecDataAddress         Comment
-HiLink srecRecCount            srecNoAddress
-HiLink srecStartAddress        srecDataAddress
+hi def link srecNoAddress           DiffAdd
+hi def link srecDataAddress         Comment
+hi def link srecRecCount            srecNoAddress
+hi def link srecStartAddress        srecDataAddress
 hi def srecDataOdd             term=bold cterm=bold gui=bold
 hi def srecDataEven            term=NONE cterm=NONE gui=NONE
-HiLink srecDataUnexpected      Error
-HiLink srecChecksum            DiffChange
+hi def link srecDataUnexpected      Error
+hi def link srecChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "srec"
 
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -226,33 +226,31 @@ syn keyword sshconfigKeyword VisualHostK
 syn keyword sshconfigKeyword XAuthLocation
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sshconfigComment        Comment
-HiLink sshconfigTodo           Todo
-HiLink sshconfigHostPort       sshconfigConstant
-HiLink sshconfigNumber         sshconfigConstant
-HiLink sshconfigConstant       Constant
-HiLink sshconfigYesNo          sshconfigEnum
-HiLink sshconfigCipher         sshconfigEnum
-HiLink sshconfigCiphers	 sshconfigEnum
-HiLink sshconfigMAC            sshconfigEnum
-HiLink sshconfigHostKeyAlgo    sshconfigEnum
-HiLink sshconfigLogLevel       sshconfigEnum
-HiLink sshconfigSysLogFacility sshconfigEnum
-HiLink sshconfigAddressFamily  sshconfigEnum
-HiLink sshconfigIPQoS		 sshconfigEnum
-HiLink sshconfigKbdInteractive sshconfigEnum
-HiLink sshconfigKexAlgo	 sshconfigEnum
-HiLink sshconfigTunnel	 sshconfigEnum
-HiLink sshconfigPreferredAuth  sshconfigEnum
-HiLink sshconfigVar            sshconfigEnum
-HiLink sshconfigEnum           Identifier
-HiLink sshconfigSpecial        Special
-HiLink sshconfigKeyword        Keyword
-HiLink sshconfigHostSect       Type
-HiLink sshconfigMatch          Type
-delcommand HiLink
+hi def link sshconfigComment        Comment
+hi def link sshconfigTodo           Todo
+hi def link sshconfigHostPort       sshconfigConstant
+hi def link sshconfigNumber         sshconfigConstant
+hi def link sshconfigConstant       Constant
+hi def link sshconfigYesNo          sshconfigEnum
+hi def link sshconfigCipher         sshconfigEnum
+hi def link sshconfigCiphers	 sshconfigEnum
+hi def link sshconfigMAC            sshconfigEnum
+hi def link sshconfigHostKeyAlgo    sshconfigEnum
+hi def link sshconfigLogLevel       sshconfigEnum
+hi def link sshconfigSysLogFacility sshconfigEnum
+hi def link sshconfigAddressFamily  sshconfigEnum
+hi def link sshconfigIPQoS		 sshconfigEnum
+hi def link sshconfigKbdInteractive sshconfigEnum
+hi def link sshconfigKexAlgo	 sshconfigEnum
+hi def link sshconfigTunnel	 sshconfigEnum
+hi def link sshconfigPreferredAuth  sshconfigEnum
+hi def link sshconfigVar            sshconfigEnum
+hi def link sshconfigEnum           Identifier
+hi def link sshconfigSpecial        Special
+hi def link sshconfigKeyword        Keyword
+hi def link sshconfigHostSect       Type
+hi def link sshconfigMatch          Type
 
 let b:current_syntax = "sshconfig"
 
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -232,36 +232,34 @@ syn keyword sshdconfigKeyword XAuthLocat
 
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sshdconfigComment              Comment
-HiLink sshdconfigTodo                 Todo
-HiLink sshdconfigHostPort             sshdconfigConstant
-HiLink sshdconfigTime                 sshdconfigConstant
-HiLink sshdconfigNumber               sshdconfigConstant
-HiLink sshdconfigConstant             Constant
-HiLink sshdconfigYesNo                sshdconfigEnum
-HiLink sshdconfigAddressFamily        sshdconfigEnum
-HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
-HiLink sshdconfigTcpForwarding        sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigCiphers              sshdconfigEnum
-HiLink sshdconfigMAC                  sshdconfigEnum
-HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigLogLevel             sshdconfigEnum
-HiLink sshdconfigSysLogFacility       sshdconfigEnum
-HiLink sshdconfigVar                  sshdconfigEnum
-HiLink sshdconfigCompression          sshdconfigEnum
-HiLink sshdconfigIPQoS                sshdconfigEnum
-HiLink sshdconfigKexAlgo              sshdconfigEnum
-HiLink sshdconfigTunnel               sshdconfigEnum
-HiLink sshdconfigSubsystem            sshdconfigEnum
-HiLink sshdconfigEnum                 Function
-HiLink sshdconfigSpecial              Special
-HiLink sshdconfigKeyword              Keyword
-HiLink sshdconfigMatch                Type
-delcommand HiLink
+hi def link sshdconfigComment              Comment
+hi def link sshdconfigTodo                 Todo
+hi def link sshdconfigHostPort             sshdconfigConstant
+hi def link sshdconfigTime                 sshdconfigConstant
+hi def link sshdconfigNumber               sshdconfigConstant
+hi def link sshdconfigConstant             Constant
+hi def link sshdconfigYesNo                sshdconfigEnum
+hi def link sshdconfigAddressFamily        sshdconfigEnum
+hi def link sshdconfigPrivilegeSeparation  sshdconfigEnum
+hi def link sshdconfigTcpForwarding        sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigCiphers              sshdconfigEnum
+hi def link sshdconfigMAC                  sshdconfigEnum
+hi def link sshdconfigHostKeyAlgo          sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigLogLevel             sshdconfigEnum
+hi def link sshdconfigSysLogFacility       sshdconfigEnum
+hi def link sshdconfigVar                  sshdconfigEnum
+hi def link sshdconfigCompression          sshdconfigEnum
+hi def link sshdconfigIPQoS                sshdconfigEnum
+hi def link sshdconfigKexAlgo              sshdconfigEnum
+hi def link sshdconfigTunnel               sshdconfigEnum
+hi def link sshdconfigSubsystem            sshdconfigEnum
+hi def link sshdconfigEnum                 Function
+hi def link sshdconfigSpecial              Special
+hi def link sshdconfigKeyword              Keyword
+hi def link sshdconfigMatch                Type
 
 let b:current_syntax = "sshdconfig"
 
diff --git a/runtime/syntax/st.vim b/runtime/syntax/st.vim
--- a/runtime/syntax/st.vim
+++ b/runtime/syntax/st.vim
@@ -75,21 +75,19 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink stKeyword		Statement
-HiLink stMethod		Statement
-HiLink stComment		Comment
-HiLink stCharacter		Constant
-HiLink stString		Constant
-HiLink stSymbol		Special
-HiLink stNumber		Type
-HiLink stFloat		Type
-HiLink stError		Error
-HiLink stLocalVariables	Identifier
-HiLink stBlockVariable	Identifier
+hi def link stKeyword		Statement
+hi def link stMethod		Statement
+hi def link stComment		Comment
+hi def link stCharacter		Constant
+hi def link stString		Constant
+hi def link stSymbol		Special
+hi def link stNumber		Type
+hi def link stFloat		Type
+hi def link stError		Error
+hi def link stLocalVariables	Identifier
+hi def link stBlockVariable	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "st"
 
diff --git a/runtime/syntax/stp.vim b/runtime/syntax/stp.vim
--- a/runtime/syntax/stp.vim
+++ b/runtime/syntax/stp.vim
@@ -129,27 +129,25 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink stpConditional Conditional
-HiLink stpComment Comment
-HiLink stpKeyword Keyword
-HiLink stpNumber Number
-HiLink stpOperator Operator
-HiLink stpSpecial Special
-HiLink stpStatement Statement
-HiLink stpString String
-HiLink stpStringError Error
-HiLink stpType Type
-HiLink stpTodo Todo
-HiLink stpFunction Function
-HiLink stpGlobals Macro
-HiLink stpParen Normal
-HiLink stpParenError Error
-HiLink stpSQLKeyword Function
-HiLink stpRepeat Repeat
+hi def link stpConditional Conditional
+hi def link stpComment Comment
+hi def link stpKeyword Keyword
+hi def link stpNumber Number
+hi def link stpOperator Operator
+hi def link stpSpecial Special
+hi def link stpStatement Statement
+hi def link stpString String
+hi def link stpStringError Error
+hi def link stpType Type
+hi def link stpTodo Todo
+hi def link stpFunction Function
+hi def link stpGlobals Macro
+hi def link stpParen Normal
+hi def link stpParenError Error
+hi def link stpSQLKeyword Function
+hi def link stpRepeat Repeat
 
-delcommand HiLink
 
 let b:current_syntax = "stp"
 
diff --git a/runtime/syntax/strace.vim b/runtime/syntax/strace.vim
--- a/runtime/syntax/strace.vim
+++ b/runtime/syntax/strace.vim
@@ -32,24 +32,22 @@ syn match straceOperator "[-+=*/!%&|:,]"
 syn region straceComment start="/\*" end="\*/" oneline
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink straceComment Comment
-HiLink straceVerbosed Comment
-HiLink stracePID PreProc
-HiLink straceNumber Number
-HiLink straceNumberRHS Type
-HiLink straceOtherRHS Type
-HiLink straceString String
-HiLink straceConstant Function
-HiLink straceEquals Type
-HiLink straceSysCallEmbed straceSysCall
-HiLink straceSysCall Statement
-HiLink straceParenthesis Statement
-HiLink straceOperator Normal
-HiLink straceSpecialChar Special
-HiLink straceOtherPID PreProc
+hi def link straceComment Comment
+hi def link straceVerbosed Comment
+hi def link stracePID PreProc
+hi def link straceNumber Number
+hi def link straceNumberRHS Type
+hi def link straceOtherRHS Type
+hi def link straceString String
+hi def link straceConstant Function
+hi def link straceEquals Type
+hi def link straceSysCallEmbed straceSysCall
+hi def link straceSysCall Statement
+hi def link straceParenthesis Statement
+hi def link straceOperator Normal
+hi def link straceSpecialChar Special
+hi def link straceOtherPID PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "strace"
diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim
--- a/runtime/syntax/svn.vim
+++ b/runtime/syntax/svn.vim
@@ -40,19 +40,17 @@ syn sync match svnSync  grouphere svnReg
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink svnSummary     Keyword
-HiLink svnBlank       Error
+hi def link svnSummary     Keyword
+hi def link svnBlank       Error
 
-HiLink svnRegion      Comment
-HiLink svnDelimiter   NonText
-HiLink svnRemoved     Constant
-HiLink svnAdded       Identifier
-HiLink svnModified    Special
-HiLink svnProperty    Special
-HiLink svnRenamed     Special
+hi def link svnRegion      Comment
+hi def link svnDelimiter   NonText
+hi def link svnRemoved     Constant
+hi def link svnAdded       Identifier
+hi def link svnModified    Special
+hi def link svnProperty    Special
+hi def link svnRenamed     Special
 
-delcommand HiLink
 
 let b:current_syntax = "svn"
diff --git a/runtime/syntax/systemverilog.vim b/runtime/syntax/systemverilog.vim
--- a/runtime/syntax/systemverilog.vim
+++ b/runtime/syntax/systemverilog.vim
@@ -69,18 +69,16 @@ syn keyword systemverilogStatement   imp
 syn keyword systemverilogStatement   interconnect soft nettype
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink systemverilogStatement       Statement
-HiLink systemverilogTypeDef         TypeDef
-HiLink systemverilogConditional     Conditional
-HiLink systemverilogRepeat          Repeat
-HiLink systemverilogLabel           Label
-HiLink systemverilogGlobal          Define
-HiLink systemverilogNumber          Number
+hi def link systemverilogStatement       Statement
+hi def link systemverilogTypeDef         TypeDef
+hi def link systemverilogConditional     Conditional
+hi def link systemverilogRepeat          Repeat
+hi def link systemverilogLabel           Label
+hi def link systemverilogGlobal          Define
+hi def link systemverilogNumber          Number
 
-delcommand HiLink
 
 let b:current_syntax = "systemverilog"
 
diff --git a/runtime/syntax/tads.vim b/runtime/syntax/tads.vim
--- a/runtime/syntax/tads.vim
+++ b/runtime/syntax/tads.vim
@@ -120,48 +120,46 @@ execute "syn sync maxlines=" . tads_sync
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink tadsFunctionDef Function
-HiLink tadsFunction  Structure
-HiLink tadsClass     Structure
-HiLink tadsClassDef  Identifier
-HiLink tadsObjectDef Identifier
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
 " no highlight for tadsEmbedded, so it prints as normal text w/in the string
 
-HiLink tadsOperator	Operator
-HiLink tadsStructure	Structure
-HiLink tadsTodo	Todo
-HiLink tadsLabel	Label
-HiLink tadsConditional	Conditional
-HiLink tadsRepeat	Repeat
-HiLink tadsException	Exception
-HiLink tadsStatement	Statement
-HiLink tadsStorageClass	StorageClass
-HiLink tadsKeyWord   Keyword
-HiLink tadsSpecial	SpecialChar
-HiLink tadsNumber	Number
-HiLink tadsBoolean	Boolean
-HiLink tadsDoubleString	tadsString
-HiLink tadsSingleString	tadsString
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
 
-HiLink tadsOctalError	tadsError
-HiLink tadsCommentError	tadsError
-HiLink tadsBraceError	tadsError
-HiLink tadsInBrace	tadsError
-HiLink tadsError	Error
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
 
-HiLink tadsInclude	Include
-HiLink tadsPreProc	PreProc
-HiLink tadsDefine	Macro
-HiLink tadsIncluded	tadsString
-HiLink tadsPreCondit	PreCondit
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
 
-HiLink tadsString	String
-HiLink tadsComment	Comment
+hi def link tadsString	String
+hi def link tadsComment	Comment
 
-delcommand HiLink
 
 
 let b:current_syntax = "tads"
diff --git a/runtime/syntax/tags.vim b/runtime/syntax/tags.vim
--- a/runtime/syntax/tags.vim
+++ b/runtime/syntax/tags.vim
@@ -1,7 +1,7 @@
 " Language:		tags
 " Maintainer:	Charles E. Campbell  <NdrOchip@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		4
+" Last Change:	Aug 31, 2016
+" Version:		6
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
@@ -19,17 +19,16 @@ syn match	tagComment	"^!_TAG_.*$"
 syn match	tagField	contained "[a-z]*:"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_drchip_tags_inits")
 
-HiLink tagBaseFile	PreProc
-HiLink tagComment	Comment
-HiLink tagDelim	Delimiter
-HiLink tagField	Number
-HiLink tagName	Identifier
-HiLink tagPath	PreProc
+  hi def link tagBaseFile	PreProc
+  hi def link tagComment	Comment
+  hi def link tagDelim	Delimiter
+  hi def link tagField	Number
+  hi def link tagName	Identifier
+  hi def link tagPath	PreProc
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "tags"
 
diff --git a/runtime/syntax/tak.vim b/runtime/syntax/tak.vim
--- a/runtime/syntax/tak.vim
+++ b/runtime/syntax/tak.vim
@@ -89,31 +89,29 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takMacro		Macro
-HiLink takOptions		Special
-HiLink takRoutine		Type
-HiLink takControl		Special
-HiLink takSolids		Special
-HiLink takSolidsArg		Statement
-HiLink takIdentifier		Identifier
+hi def link takMacro		Macro
+hi def link takOptions		Special
+hi def link takRoutine		Type
+hi def link takControl		Special
+hi def link takSolids		Special
+hi def link takSolidsArg		Statement
+hi def link takIdentifier		Identifier
 
-HiLink takFortran		PreProc
-HiLink takMotran		PreProc
+hi def link takFortran		PreProc
+hi def link takMotran		PreProc
 
-HiLink takComment		Comment
-HiLink takHeader		Typedef
-HiLink takIncludeFile		Type
-HiLink takInteger		Number
-HiLink takFloat		Float
-HiLink takScientific		Float
+hi def link takComment		Comment
+hi def link takHeader		Typedef
+hi def link takIncludeFile		Type
+hi def link takInteger		Number
+hi def link takFloat		Float
+hi def link takScientific		Float
 
-HiLink takEndData		Macro
+hi def link takEndData		Macro
 
-HiLink takTodo		Todo
+hi def link takTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "tak"
diff --git a/runtime/syntax/takcmp.vim b/runtime/syntax/takcmp.vim
--- a/runtime/syntax/takcmp.vim
+++ b/runtime/syntax/takcmp.vim
@@ -49,21 +49,19 @@ syn case ignore
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takcmpTitle		   Type
-HiLink takcmpUnit		   PreProc
+hi def link takcmpTitle		   Type
+hi def link takcmpUnit		   PreProc
 
-HiLink takcmpLabel		   Statement
+hi def link takcmpLabel		   Statement
 
-HiLink takcmpHeader		   takHeader
+hi def link takcmpHeader		   takHeader
 
-HiLink takcmpDate		   Identifier
-HiLink takcmpTime		   Identifier
-HiLink takcmpInteger		   Number
-HiLink takcmpFloat		   Special
+hi def link takcmpDate		   Identifier
+hi def link takcmpTime		   Identifier
+hi def link takcmpInteger		   Number
+hi def link takcmpFloat		   Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "takcmp"
diff --git a/runtime/syntax/takout.vim b/runtime/syntax/takout.vim
--- a/runtime/syntax/takout.vim
+++ b/runtime/syntax/takout.vim
@@ -64,22 +64,20 @@ syn match takoutError	     "<<< Error >>
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takoutPos		   Statement
-HiLink takoutNeg		   PreProc
-HiLink takoutTitle		   Type
-HiLink takoutFile		   takIncludeFile
-HiLink takoutInteger		   takInteger
+hi def link takoutPos		   Statement
+hi def link takoutNeg		   PreProc
+hi def link takoutTitle		   Type
+hi def link takoutFile		   takIncludeFile
+hi def link takoutInteger		   takInteger
 
-HiLink takoutSectionDelim	    Delimiter
-HiLink takoutSectionTitle	   Exception
-HiLink takoutHeaderDelim	   SpecialComment
-HiLink takoutLabel		   Identifier
+hi def link takoutSectionDelim	    Delimiter
+hi def link takoutSectionTitle	   Exception
+hi def link takoutHeaderDelim	   SpecialComment
+hi def link takoutLabel		   Identifier
 
-HiLink takoutError		   Error
+hi def link takoutError		   Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "takout"
diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim
--- a/runtime/syntax/tasm.vim
+++ b/runtime/syntax/tasm.vim
@@ -93,23 +93,21 @@ syn match tasmBin "\<[01]\+B\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tasmString String
-HiLink tasmDec Number
-HiLink tasmHex Number
-HiLink tasmOct Number
-HiLink tasmBin Number
-HiLink tasmInstruction Keyword
-HiLink tasmCoprocInstr Keyword
-HiLink tasmMMXInst	Keyword
-HiLink tasmDirective PreProc
-HiLink tasmRegister Identifier
-HiLink tasmProctype PreProc
-HiLink tasmComment Comment
-HiLink tasmLabel Label
+hi def link tasmString String
+hi def link tasmDec Number
+hi def link tasmHex Number
+hi def link tasmOct Number
+hi def link tasmBin Number
+hi def link tasmInstruction Keyword
+hi def link tasmCoprocInstr Keyword
+hi def link tasmMMXInst	Keyword
+hi def link tasmDirective PreProc
+hi def link tasmRegister Identifier
+hi def link tasmProctype PreProc
+hi def link tasmComment Comment
+hi def link tasmLabel Label
 
-delcommand HiLink
 
 let b:curret_syntax = "tasm"
 
diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim
--- a/runtime/syntax/tcl.vim
+++ b/runtime/syntax/tcl.vim
@@ -236,40 +236,38 @@ syn region  tclComment		start=/;\s*\#/hs
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tcltkSwitch		Special
-HiLink tclExpand		Special
-HiLink tclLabel		Label
-HiLink tclConditional		Conditional
-HiLink tclRepeat		Repeat
-HiLink tclNumber		Number
-HiLink tclError		Error
-HiLink tclCommand		Statement
-HiLink tclProcCommand		Type
-HiLink tclString		String
-HiLink tclComment		Comment
-HiLink tclSpecial		Special
-HiLink tclTodo		Todo
+hi def link tcltkSwitch		Special
+hi def link tclExpand		Special
+hi def link tclLabel		Label
+hi def link tclConditional		Conditional
+hi def link tclRepeat		Repeat
+hi def link tclNumber		Number
+hi def link tclError		Error
+hi def link tclCommand		Statement
+hi def link tclProcCommand		Type
+hi def link tclString		String
+hi def link tclComment		Comment
+hi def link tclSpecial		Special
+hi def link tclTodo		Todo
 " Below here are the commands and their options.
-HiLink tcltkCommandColor	Statement
-HiLink tcltkWidgetColor	Structure
-HiLink tclLineContinue	WarningMsg
+hi def link tcltkCommandColor	Statement
+hi def link tcltkWidgetColor	Structure
+hi def link tclLineContinue	WarningMsg
 if exists('g:tcl_warn_continuation')
-HiLink tclNotLineContinue	ErrorMsg
+hi def link tclNotLineContinue	ErrorMsg
 endif
-HiLink tcltkStringSwitch	Special
-HiLink tcltkArraySwitch	Special
-HiLink tcltkLsortSwitch	Special
-HiLink tcltkPackSwitch	Special
-HiLink tcltkPackConfSwitch	Special
-HiLink tcltkMaths		Special
-HiLink tcltkNamespaceSwitch	Special
-HiLink tcltkWidgetSwitch	Special
-HiLink tcltkPackConfColor	Identifier
-HiLink tclVarRef		Identifier
+hi def link tcltkStringSwitch	Special
+hi def link tcltkArraySwitch	Special
+hi def link tcltkLsortSwitch	Special
+hi def link tcltkPackSwitch	Special
+hi def link tcltkPackConfSwitch	Special
+hi def link tcltkMaths		Special
+hi def link tcltkNamespaceSwitch	Special
+hi def link tcltkWidgetSwitch	Special
+hi def link tcltkPackConfColor	Identifier
+hi def link tclVarRef		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "tcl"
 
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Jul 05, 2016
-" Version:	98
+" Last Change:	Aug 31, 2016
+" Version:	100
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -48,12 +48,6 @@ let s:keepcpo= &cpo
 set cpo&vim
 scriptencoding utf-8
 
-" Define the default highlighting. {{{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
-let did_tex_syntax_inits = 1
-command -nargs=+ HiLink hi def link <args>
-
 " by default, enable all region-based highlighting
 let s:tex_fast= "bcmMprsSvV"
 if exists("g:tex_fast")
@@ -405,7 +399,7 @@ if !exists("g:tex_no_math")
  " TexNewMathZone: function creates a mathzone with the given suffix and mathzone name. {{{2
  "                 Starred forms are created if starform is true.  Starred
  "                 forms have syntax group and synchronization groups with a
- "                 "S" appended.  Handles: cluster, syntax, sync, and HiLink.
+ "                 "S" appended.  Handles: cluster, syntax, sync, and hi link.
  fun! TexNewMathZone(sfx,mathzone,starform)
    let grpname  = "texMathZone".a:sfx
    let syncname = "texSyncMathZone".a:sfx
@@ -1260,86 +1254,87 @@ endif
 
 " ---------------------------------------------------------------------
 " Highlighting: {{{1
-if did_tex_syntax_inits == 1
- let did_tex_syntax_inits= 2
+
+" Define the default highlighting. {{{1
+if !exists("skip_tex_syntax_inits")
+
   " TeX highlighting groups which should share similar highlighting
   if !exists("g:tex_no_error")
    if !exists("g:tex_no_math")
-    HiLink texBadMath		texError
-    HiLink texMathDelimBad	texError
-    HiLink texMathError		texError
+    hi def link texBadMath		texError
+    hi def link texMathDelimBad	texError
+    hi def link texMathError		texError
     if !b:tex_stylish
-      HiLink texOnlyMath	texError
+      hi def link texOnlyMath	texError
     endif
    endif
-   HiLink texError		Error
+   hi def link texError		Error
   endif
 
   hi texBoldStyle		gui=bold	cterm=bold
   hi texItalStyle		gui=italic	cterm=italic
   hi texBoldItalStyle		gui=bold,italic cterm=bold,italic
   hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
-  HiLink texCite		texRefZone
-  HiLink texDefCmd		texDef
-  HiLink texDefName		texDef
-  HiLink texDocType		texCmdName
-  HiLink texDocTypeArgs		texCmdArgs
-  HiLink texInputFileOpt	texCmdArgs
-  HiLink texInputCurlies	texDelimiter
-  HiLink texLigature		texSpecialChar
+  hi def link texCite		texRefZone
+  hi def link texDefCmd		texDef
+  hi def link texDefName		texDef
+  hi def link texDocType		texCmdName
+  hi def link texDocTypeArgs		texCmdArgs
+  hi def link texInputFileOpt	texCmdArgs
+  hi def link texInputCurlies	texDelimiter
+  hi def link texLigature		texSpecialChar
   if !exists("g:tex_no_math")
-   HiLink texMathDelimSet1	texMathDelim
-   HiLink texMathDelimSet2	texMathDelim
-   HiLink texMathDelimKey	texMathDelim
-   HiLink texMathMatcher	texMath
-   HiLink texAccent		texStatement
-   HiLink texGreek		texStatement
-   HiLink texSuperscript	texStatement
-   HiLink texSubscript		texStatement
-   HiLink texSuperscripts 	texSuperscript
-   HiLink texSubscripts 	texSubscript
-   HiLink texMathSymbol		texStatement
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneW		texMath
-   HiLink texMathZoneX		texMath
-   HiLink texMathZoneY		texMath
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneZ		texMath
+   hi def link texMathDelimSet1	texMathDelim
+   hi def link texMathDelimSet2	texMathDelim
+   hi def link texMathDelimKey	texMathDelim
+   hi def link texMathMatcher	texMath
+   hi def link texAccent		texStatement
+   hi def link texGreek		texStatement
+   hi def link texSuperscript	texStatement
+   hi def link texSubscript		texStatement
+   hi def link texSuperscripts 	texSuperscript
+   hi def link texSubscripts 	texSubscript
+   hi def link texMathSymbol		texStatement
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneW		texMath
+   hi def link texMathZoneX		texMath
+   hi def link texMathZoneY		texMath
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneZ		texMath
   endif
-  HiLink texBeginEnd		texCmdName
-  HiLink texBeginEndName	texSection
-  HiLink texSpaceCode		texStatement
-  HiLink texStyleStatement	texStatement
-  HiLink texTypeSize		texType
-  HiLink texTypeStyle		texType
+  hi def link texBeginEnd		texCmdName
+  hi def link texBeginEndName	texSection
+  hi def link texSpaceCode		texStatement
+  hi def link texStyleStatement	texStatement
+  hi def link texTypeSize		texType
+  hi def link texTypeStyle		texType
 
    " Basic TeX highlighting groups
-  HiLink texCmdArgs		Number
-  HiLink texCmdName		Statement
-  HiLink texComment		Comment
-  HiLink texDef			Statement
-  HiLink texDefParm		Special
-  HiLink texDelimiter		Delimiter
-  HiLink texInput		Special
-  HiLink texInputFile		Special
-  HiLink texLength		Number
-  HiLink texMath		Special
-  HiLink texMathDelim		Statement
-  HiLink texMathOper		Operator
-  HiLink texNewCmd		Statement
-  HiLink texNewEnv		Statement
-  HiLink texOption		Number
-  HiLink texRefZone		Special
-  HiLink texSection		PreCondit
-  HiLink texSpaceCodeChar	Special
-  HiLink texSpecialChar		SpecialChar
-  HiLink texStatement		Statement
-  HiLink texString		String
-  HiLink texTodo		Todo
-  HiLink texType		Type
-  HiLink texZone		PreCondit
+  hi def link texCmdArgs		Number
+  hi def link texCmdName		Statement
+  hi def link texComment		Comment
+  hi def link texDef			Statement
+  hi def link texDefParm		Special
+  hi def link texDelimiter		Delimiter
+  hi def link texInput		Special
+  hi def link texInputFile		Special
+  hi def link texLength		Number
+  hi def link texMath		Special
+  hi def link texMathDelim		Statement
+  hi def link texMathOper		Operator
+  hi def link texNewCmd		Statement
+  hi def link texNewEnv		Statement
+  hi def link texOption		Number
+  hi def link texRefZone		Special
+  hi def link texSection		PreCondit
+  hi def link texSpaceCodeChar	Special
+  hi def link texSpecialChar		SpecialChar
+  hi def link texStatement		Statement
+  hi def link texString		String
+  hi def link texTodo		Todo
+  hi def link texType		Type
+  hi def link texZone		PreCondit
 
-  delcommand HiLink
 endif
 
 " Cleanup: {{{1
diff --git a/runtime/syntax/texinfo.vim b/runtime/syntax/texinfo.vim
--- a/runtime/syntax/texinfo.vim
+++ b/runtime/syntax/texinfo.vim
@@ -355,38 +355,36 @@ syn cluster texinfoReducedAll contains=t
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texinfoSpecialChar	Special
-HiLink texinfoHFSpecialChar	Special
+hi def link texinfoSpecialChar	Special
+hi def link texinfoHFSpecialChar	Special
 
-HiLink texinfoError		Error
-HiLink texinfoIdent		Identifier
-HiLink texinfoAssignment	Identifier
-HiLink texinfoSinglePar	Identifier
-HiLink texinfoIndexPar	Identifier
-HiLink texinfoSIPar		Identifier
-HiLink texinfoDIEPar		Identifier
-HiLink texinfoTexCmd		PreProc
+hi def link texinfoError		Error
+hi def link texinfoIdent		Identifier
+hi def link texinfoAssignment	Identifier
+hi def link texinfoSinglePar	Identifier
+hi def link texinfoIndexPar	Identifier
+hi def link texinfoSIPar		Identifier
+hi def link texinfoDIEPar		Identifier
+hi def link texinfoTexCmd		PreProc
 
 
-HiLink texinfoAtCmd		Statement	"@-command
-HiLink texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
+hi def link texinfoAtCmd		Statement	"@-command
+hi def link texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
 					      "is String because is found as a region and is 'matchgroup'-ed
 					      "to texinfoAtCmd
-HiLink texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
+hi def link texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
-HiLink texinfoMltlnAtCmd	String		"@-command in multiple lines
+hi def link texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
+hi def link texinfoMltlnAtCmd	String		"@-command in multiple lines
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
-HiLink texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
+hi def link texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
+hi def link texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
 
-HiLink texinfoComment	Comment
+hi def link texinfoComment	Comment
 
-delcommand HiLink
 
 
 let b:current_syntax = "texinfo"
diff --git a/runtime/syntax/texmf.vim b/runtime/syntax/texmf.vim
--- a/runtime/syntax/texmf.vim
+++ b/runtime/syntax/texmf.vim
@@ -42,35 +42,33 @@ syn region texmfBrace matchgroup=texmfBr
 syn match texmfBraceError "}"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texmfComment Comment
-HiLink texmfTodo Todo
+hi def link texmfComment Comment
+hi def link texmfTodo Todo
 
-HiLink texmfPassedParameter texmfVariable
-HiLink texmfVariable Identifier
+hi def link texmfPassedParameter texmfVariable
+hi def link texmfVariable Identifier
 
-HiLink texmfNumber Number
-HiLink texmfString String
+hi def link texmfNumber Number
+hi def link texmfString String
 
-HiLink texmfLHSStart texmfLHS
-HiLink texmfLHSVariable texmfLHS
-HiLink texmfLHSDot texmfLHS
-HiLink texmfLHS Type
+hi def link texmfLHSStart texmfLHS
+hi def link texmfLHSVariable texmfLHS
+hi def link texmfLHSDot texmfLHS
+hi def link texmfLHS Type
 
-HiLink texmfEquals Normal
+hi def link texmfEquals Normal
 
-HiLink texmfBraceBrace texmfDelimiter
-HiLink texmfComma texmfDelimiter
-HiLink texmfColons texmfDelimiter
-HiLink texmfDelimiter Preproc
+hi def link texmfBraceBrace texmfDelimiter
+hi def link texmfComma texmfDelimiter
+hi def link texmfColons texmfDelimiter
+hi def link texmfDelimiter Preproc
 
-HiLink texmfDoubleExclam Statement
-HiLink texmfSpecial Special
+hi def link texmfDoubleExclam Statement
+hi def link texmfSpecial Special
 
-HiLink texmfBraceError texmfError
-HiLink texmfError Error
+hi def link texmfBraceError texmfError
+hi def link texmfError Error
 
-delcommand HiLink
 
 let b:current_syntax = "texmf"
diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim
--- a/runtime/syntax/tf.vim
+++ b/runtime/syntax/tf.vim
@@ -159,35 +159,33 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tfComment		Comment
-HiLink tfString		String
-HiLink tfNumber		Number
-HiLink tfFloat		Float
-HiLink tfIdentifier		Identifier
-HiLink tfVar			Identifier
-HiLink tfWorld		Identifier
-HiLink tfReadonly		Identifier
-HiLink tfHook		Identifier
-HiLink tfFunctions		Function
-HiLink tfRepeat		Repeat
-HiLink tfConditional		Conditional
-HiLink tfLabel		Label
-HiLink tfStatement		Statement
-HiLink tfType		Type
-HiLink tfInclude		Include
-HiLink tfDefine		Define
-HiLink tfSpecialChar		SpecialChar
-HiLink tfSpecialCharEsc	SpecialChar
-HiLink tfParentError		Error
-HiLink tfTodo		Todo
-HiLink tfEndCommand		Delimiter
-HiLink tfJoinLines		Delimiter
-HiLink tfOperator		Operator
-HiLink tfRelation		Operator
+hi def link tfComment		Comment
+hi def link tfString		String
+hi def link tfNumber		Number
+hi def link tfFloat		Float
+hi def link tfIdentifier		Identifier
+hi def link tfVar			Identifier
+hi def link tfWorld		Identifier
+hi def link tfReadonly		Identifier
+hi def link tfHook		Identifier
+hi def link tfFunctions		Function
+hi def link tfRepeat		Repeat
+hi def link tfConditional		Conditional
+hi def link tfLabel		Label
+hi def link tfStatement		Statement
+hi def link tfType		Type
+hi def link tfInclude		Include
+hi def link tfDefine		Define
+hi def link tfSpecialChar		SpecialChar
+hi def link tfSpecialCharEsc	SpecialChar
+hi def link tfParentError		Error
+hi def link tfTodo		Todo
+hi def link tfEndCommand		Delimiter
+hi def link tfJoinLines		Delimiter
+hi def link tfOperator		Operator
+hi def link tfRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "tf"
 
diff --git a/runtime/syntax/tli.vim b/runtime/syntax/tli.vim
--- a/runtime/syntax/tli.vim
+++ b/runtime/syntax/tli.vim
@@ -42,18 +42,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tliNumber	Number
-HiLink tliString	String
-HiLink tliComment	Comment
-HiLink tliSpecial	SpecialChar
-HiLink tliIdentifier Identifier
-HiLink tliObject     Statement
-HiLink tliField      Type
-HiLink tliStyle      PreProc
+hi def link tliNumber	Number
+hi def link tliString	String
+hi def link tliComment	Comment
+hi def link tliSpecial	SpecialChar
+hi def link tliIdentifier Identifier
+hi def link tliObject     Statement
+hi def link tliField      Type
+hi def link tliStyle      PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "tli"
 
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
--- a/runtime/syntax/tpp.vim
+++ b/runtime/syntax/tpp.vim
@@ -59,26 +59,24 @@ syn match tppComment "^--##.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tppAbstractOptionKey		Special
-HiLink tppPageLocalOptionKey		Keyword
-HiLink tppPageLocalSwitchKey		Keyword
-HiLink tppColorOptionKey		Keyword
-HiLink tppTimeOptionKey		Comment
-HiLink tppNewPageOptionKey		PreProc
-HiLink tppString			String
-HiLink tppColor			String
-HiLink tppTime			Number
-HiLink tppComment			Comment
-HiLink tppAbstractOption		Error
-HiLink tppPageLocalOption		Error
-HiLink tppPageLocalSwitch		Error
-HiLink tppColorOption			Error
-HiLink tppNewPageOption		Error
-HiLink tppTimeOption			Error
+hi def link tppAbstractOptionKey		Special
+hi def link tppPageLocalOptionKey		Keyword
+hi def link tppPageLocalSwitchKey		Keyword
+hi def link tppColorOptionKey		Keyword
+hi def link tppTimeOptionKey		Comment
+hi def link tppNewPageOptionKey		PreProc
+hi def link tppString			String
+hi def link tppColor			String
+hi def link tppTime			Number
+hi def link tppComment			Comment
+hi def link tppAbstractOption		Error
+hi def link tppPageLocalOption		Error
+hi def link tppPageLocalSwitch		Error
+hi def link tppColorOption			Error
+hi def link tppNewPageOption		Error
+hi def link tppTimeOption			Error
 
-delcommand HiLink
 
 let b:current_syntax = "tpp"
 
diff --git a/runtime/syntax/trasys.vim b/runtime/syntax/trasys.vim
--- a/runtime/syntax/trasys.vim
+++ b/runtime/syntax/trasys.vim
@@ -130,31 +130,29 @@ syn sync match trasysSync grouphere tras
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink trasysOptions		Special
-HiLink trasysSurface		Special
-HiLink trasysSurfaceType	Constant
-HiLink trasysSurfaceArgs	Constant
-HiLink trasysArgs		Constant
-HiLink trasysOperations	Statement
-HiLink trasysSubRoutine	Statement
-HiLink trassyPrcsrSegm	PreProc
-HiLink trasysIdentifier	Identifier
-HiLink trasysComment		Comment
-HiLink trasysHeader		Typedef
-HiLink trasysMacro		Macro
-HiLink trasysInteger		Number
-HiLink trasysFloat		Float
-HiLink trasysScientific	Float
+hi def link trasysOptions		Special
+hi def link trasysSurface		Special
+hi def link trasysSurfaceType	Constant
+hi def link trasysSurfaceArgs	Constant
+hi def link trasysArgs		Constant
+hi def link trasysOperations	Statement
+hi def link trasysSubRoutine	Statement
+hi def link trassyPrcsrSegm	PreProc
+hi def link trasysIdentifier	Identifier
+hi def link trasysComment		Comment
+hi def link trasysHeader		Typedef
+hi def link trasysMacro		Macro
+hi def link trasysInteger		Number
+hi def link trasysFloat		Float
+hi def link trasysScientific	Float
 
-HiLink trasysBlank		SpecialChar
-
-HiLink trasysEndData		Macro
+hi def link trasysBlank		SpecialChar
 
-HiLink trasysTodo		Todo
+hi def link trasysEndData		Macro
 
-delcommand HiLink
+hi def link trasysTodo		Todo
+
 
 
 let b:current_syntax = "trasys"
diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim
--- a/runtime/syntax/tsalt.vim
+++ b/runtime/syntax/tsalt.vim
@@ -169,37 +169,35 @@ syn sync ccomment tsaltComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tsaltFunction		Statement
-HiLink tsaltSysVar		Type
-"HiLink tsaltLibFunc		UserDefFunc
-"HiLink tsaltConstants		Type
-"HiLink tsaltFuncArg		Type
-"HiLink tsaltOperator		Operator
-"HiLink tsaltLabel		Label
-"HiLink tsaltUserLabel		Label
-HiLink tsaltConditional		Conditional
-HiLink tsaltRepeat		Repeat
-HiLink tsaltCharacter		SpecialChar
-HiLink tsaltSpecialCharacter	SpecialChar
-HiLink tsaltNumber		Number
-HiLink tsaltFloat		Float
-HiLink tsaltCommentError	tsaltError
-HiLink tsaltInclude		Include
-HiLink tsaltPreProc		PreProc
-HiLink tsaltDefine		Macro
-HiLink tsaltIncluded		tsaltString
-HiLink tsaltError		Error
-HiLink tsaltStatement		Statement
-HiLink tsaltPreCondit		PreCondit
-HiLink tsaltType		Type
-HiLink tsaltString		String
-HiLink tsaltComment		Comment
-HiLink tsaltSpecial		Special
-HiLink tsaltTodo		Todo
+hi def link tsaltFunction		Statement
+hi def link tsaltSysVar		Type
+"hi def link tsaltLibFunc		UserDefFunc
+"hi def link tsaltConstants		Type
+"hi def link tsaltFuncArg		Type
+"hi def link tsaltOperator		Operator
+"hi def link tsaltLabel		Label
+"hi def link tsaltUserLabel		Label
+hi def link tsaltConditional		Conditional
+hi def link tsaltRepeat		Repeat
+hi def link tsaltCharacter		SpecialChar
+hi def link tsaltSpecialCharacter	SpecialChar
+hi def link tsaltNumber		Number
+hi def link tsaltFloat		Float
+hi def link tsaltCommentError	tsaltError
+hi def link tsaltInclude		Include
+hi def link tsaltPreProc		PreProc
+hi def link tsaltDefine		Macro
+hi def link tsaltIncluded		tsaltString
+hi def link tsaltError		Error
+hi def link tsaltStatement		Statement
+hi def link tsaltPreCondit		PreCondit
+hi def link tsaltType		Type
+hi def link tsaltString		String
+hi def link tsaltComment		Comment
+hi def link tsaltSpecial		Special
+hi def link tsaltTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "tsalt"
 
diff --git a/runtime/syntax/tsscl.vim b/runtime/syntax/tsscl.vim
--- a/runtime/syntax/tsscl.vim
+++ b/runtime/syntax/tsscl.vim
@@ -177,28 +177,26 @@ syn match  tssclScientific  "-\=\<[0-9]*
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssclCommand		Statement
-HiLink tssclKeyword		Special
-HiLink tssclEnd		Macro
-HiLink tssclUnits		Special
+hi def link tssclCommand		Statement
+hi def link tssclKeyword		Special
+hi def link tssclEnd		Macro
+hi def link tssclUnits		Special
 
-HiLink tssclComment		Comment
-HiLink tssclDirective		Statement
-HiLink tssclConditional	Conditional
-HiLink tssclContChar		Macro
-HiLink tssclQualifier		Typedef
-HiLink tssclSymbol		Identifier
-HiLink tssclSymbol2		Symbol
-HiLink tssclString		String
-HiLink tssclOper		Operator
+hi def link tssclComment		Comment
+hi def link tssclDirective		Statement
+hi def link tssclConditional	Conditional
+hi def link tssclContChar		Macro
+hi def link tssclQualifier		Typedef
+hi def link tssclSymbol		Identifier
+hi def link tssclSymbol2		Symbol
+hi def link tssclString		String
+hi def link tssclOper		Operator
 
-HiLink tssclInteger		Number
-HiLink tssclFloat		Number
-HiLink tssclScientific	Number
+hi def link tssclInteger		Number
+hi def link tssclFloat		Number
+hi def link tssclScientific	Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "tsscl"
diff --git a/runtime/syntax/tssgm.vim b/runtime/syntax/tssgm.vim
--- a/runtime/syntax/tssgm.vim
+++ b/runtime/syntax/tssgm.vim
@@ -73,26 +73,24 @@ syn match  tssgmScientific  "-\=\<[0-9]*
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssgmParam		Statement
-HiLink tssgmSurfType		Type
-HiLink tssgmArgs		Special
-HiLink tssgmDelim		Typedef
-HiLink tssgmEnd		Macro
-HiLink tssgmUnits		Special
+hi def link tssgmParam		Statement
+hi def link tssgmSurfType		Type
+hi def link tssgmArgs		Special
+hi def link tssgmDelim		Typedef
+hi def link tssgmEnd		Macro
+hi def link tssgmUnits		Special
 
-HiLink tssgmDefault		SpecialComment
-HiLink tssgmComment		Statement
-HiLink tssgmCommentString	Comment
-HiLink tssgmSurfIdent		Identifier
-HiLink tssgmString		Delimiter
+hi def link tssgmDefault		SpecialComment
+hi def link tssgmComment		Statement
+hi def link tssgmCommentString	Comment
+hi def link tssgmSurfIdent		Identifier
+hi def link tssgmString		Delimiter
 
-HiLink tssgmInteger		Number
-HiLink tssgmFloat		Float
-HiLink tssgmScientific	Float
+hi def link tssgmInteger		Number
+hi def link tssgmFloat		Float
+hi def link tssgmScientific	Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "tssgm"
diff --git a/runtime/syntax/tssop.vim b/runtime/syntax/tssop.vim
--- a/runtime/syntax/tssop.vim
+++ b/runtime/syntax/tssop.vim
@@ -54,21 +54,19 @@ syn match  tssopScientific  "-\=\<[0-9]*
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssopParam		Statement
-HiLink tssopProp		Identifier
-HiLink tssopArgs		Special
+hi def link tssopParam		Statement
+hi def link tssopProp		Identifier
+hi def link tssopArgs		Special
 
-HiLink tssopComment		Statement
-HiLink tssopCommentString	Comment
-HiLink tssopPropName		Typedef
+hi def link tssopComment		Statement
+hi def link tssopCommentString	Comment
+hi def link tssopPropName		Typedef
 
-HiLink tssopInteger		Number
-HiLink tssopFloat		Float
-HiLink tssopScientific	Float
+hi def link tssopInteger		Number
+hi def link tssopFloat		Float
+hi def link tssopScientific	Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "tssop"
diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim
--- a/runtime/syntax/uc.vim
+++ b/runtime/syntax/uc.vim
@@ -108,55 +108,53 @@ exec "syn sync ccomment ucComment minlin
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ucFuncDef			Conditional
-HiLink ucEventDef			Conditional
-HiLink ucBraces			Function
-HiLink ucBranch			Conditional
-HiLink ucLabel			Label
-HiLink ucUserLabel			Label
-HiLink ucConditional			Conditional
-HiLink ucRepeat			Repeat
-HiLink ucStorageClass			StorageClass
-HiLink ucMethodDecl			ucStorageClass
-HiLink ucClassDecl			ucStorageClass
-HiLink ucScopeDecl			ucStorageClass
-HiLink ucBoolean			Boolean
-HiLink ucSpecial			Special
-HiLink ucSpecialError			Error
-HiLink ucSpecialCharError		Error
-HiLink ucString			String
-HiLink ucCharacter			Character
-HiLink ucSpecialChar			SpecialChar
-HiLink ucNumber			Number
-HiLink ucError			Error
-HiLink ucStringError			Error
-HiLink ucStatement			Statement
-HiLink ucOperator			Operator
-HiLink ucOverLoaded			Operator
-HiLink ucComment			Comment
-HiLink ucDocComment			Comment
-HiLink ucLineComment			Comment
-HiLink ucConstant			ucBoolean
-HiLink ucTypedef			Typedef
-HiLink ucTodo				Todo
+hi def link ucFuncDef			Conditional
+hi def link ucEventDef			Conditional
+hi def link ucBraces			Function
+hi def link ucBranch			Conditional
+hi def link ucLabel			Label
+hi def link ucUserLabel			Label
+hi def link ucConditional			Conditional
+hi def link ucRepeat			Repeat
+hi def link ucStorageClass			StorageClass
+hi def link ucMethodDecl			ucStorageClass
+hi def link ucClassDecl			ucStorageClass
+hi def link ucScopeDecl			ucStorageClass
+hi def link ucBoolean			Boolean
+hi def link ucSpecial			Special
+hi def link ucSpecialError			Error
+hi def link ucSpecialCharError		Error
+hi def link ucString			String
+hi def link ucCharacter			Character
+hi def link ucSpecialChar			SpecialChar
+hi def link ucNumber			Number
+hi def link ucError			Error
+hi def link ucStringError			Error
+hi def link ucStatement			Statement
+hi def link ucOperator			Operator
+hi def link ucOverLoaded			Operator
+hi def link ucComment			Comment
+hi def link ucDocComment			Comment
+hi def link ucLineComment			Comment
+hi def link ucConstant			ucBoolean
+hi def link ucTypedef			Typedef
+hi def link ucTodo				Todo
 
-HiLink ucCommentTitle			SpecialComment
-HiLink ucDocTags			Special
-HiLink ucDocParam			Function
-HiLink ucCommentStar			ucComment
-
-HiLink ucType				Type
-HiLink ucExternal			Include
+hi def link ucCommentTitle			SpecialComment
+hi def link ucDocTags			Special
+hi def link ucDocParam			Function
+hi def link ucCommentStar			ucComment
 
-HiLink ucClassKeys			Conditional
-HiLink ucClassLabel			Conditional
+hi def link ucType				Type
+hi def link ucExternal			Include
 
-HiLink htmlComment			Special
-HiLink htmlCommentPart		Special
+hi def link ucClassKeys			Conditional
+hi def link ucClassLabel			Conditional
 
-delcommand HiLink
+hi def link htmlComment			Special
+hi def link htmlCommentPart		Special
+
 
 let b:current_syntax = "uc"
 
diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim
--- a/runtime/syntax/uil.vim
+++ b/runtime/syntax/uil.vim
@@ -46,28 +46,26 @@ syn sync ccomment uilComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink uilCharacter		uilString
-HiLink uilSpecialCharacter	uilSpecial
-HiLink uilNumber		uilString
-HiLink uilCommentError	uilError
-HiLink uilInclude		uilPreCondit
-HiLink uilDefine		uilPreCondit
-HiLink uilIncluded		uilString
-HiLink uilSpecialFunction	uilRessource
-HiLink uilRessource		Identifier
-HiLink uilSpecialStatement	Keyword
-HiLink uilError		Error
-HiLink uilPreCondit		PreCondit
-HiLink uilType		Type
-HiLink uilString		String
-HiLink uilComment		Comment
-HiLink uilSpecial		Special
-HiLink uilTodo		Todo
+hi def link uilCharacter		uilString
+hi def link uilSpecialCharacter	uilSpecial
+hi def link uilNumber		uilString
+hi def link uilCommentError	uilError
+hi def link uilInclude		uilPreCondit
+hi def link uilDefine		uilPreCondit
+hi def link uilIncluded		uilString
+hi def link uilSpecialFunction	uilRessource
+hi def link uilRessource		Identifier
+hi def link uilSpecialStatement	Keyword
+hi def link uilError		Error
+hi def link uilPreCondit		PreCondit
+hi def link uilType		Type
+hi def link uilString		String
+hi def link uilComment		Comment
+hi def link uilSpecial		Special
+hi def link uilTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "uil"
diff --git a/runtime/syntax/vb.vim b/runtime/syntax/vb.vim
--- a/runtime/syntax/vb.vim
+++ b/runtime/syntax/vb.vim
@@ -336,31 +336,29 @@ syn match   vbTypeSpecifier  "#[a-zA-Z0-
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vbBoolean		Boolean
-HiLink vbLineNumber		Comment
-HiLink vbComment		Comment
-HiLink vbConditional	Conditional
-HiLink vbConst			Constant
-HiLink vbDefine			Constant
-HiLink vbError			Error
-HiLink vbFunction		Identifier
-HiLink vbIdentifier		Identifier
-HiLink vbNumber			Number
-HiLink vbFloat			Float
-HiLink vbMethods		PreProc
-HiLink vbOperator		Operator
-HiLink vbRepeat			Repeat
-HiLink vbString			String
-HiLink vbStatement		Statement
-HiLink vbKeyword		Statement
-HiLink vbEvents			Special
-HiLink vbTodo			Todo
-HiLink vbTypes			Type
-HiLink vbTypeSpecifier	Type
+hi def link vbBoolean		Boolean
+hi def link vbLineNumber		Comment
+hi def link vbComment		Comment
+hi def link vbConditional	Conditional
+hi def link vbConst			Constant
+hi def link vbDefine			Constant
+hi def link vbError			Error
+hi def link vbFunction		Identifier
+hi def link vbIdentifier		Identifier
+hi def link vbNumber			Number
+hi def link vbFloat			Float
+hi def link vbMethods		PreProc
+hi def link vbOperator		Operator
+hi def link vbRepeat			Repeat
+hi def link vbString			String
+hi def link vbStatement		Statement
+hi def link vbKeyword		Statement
+hi def link vbEvents			Special
+hi def link vbTodo			Todo
+hi def link vbTypes			Type
+hi def link vbTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "vb"
 
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
--- a/runtime/syntax/vera.vim
+++ b/runtime/syntax/vera.vim
@@ -285,65 +285,63 @@ exec "syn sync ccomment veraComment minl
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink veraClass		Identifier
-HiLink veraObject		Identifier
-HiLink veraUserMethod		Function
-HiLink veraTask		Keyword
-HiLink veraModifier		Tag
-HiLink veraDeprecated		veraError
-HiLink veraMethods		Statement
-" HiLink veraInterface		Label
-HiLink veraInterface		Function
+hi def link veraClass		Identifier
+hi def link veraObject		Identifier
+hi def link veraUserMethod		Function
+hi def link veraTask		Keyword
+hi def link veraModifier		Tag
+hi def link veraDeprecated		veraError
+hi def link veraMethods		Statement
+" hi def link veraInterface		Label
+hi def link veraInterface		Function
 
-HiLink veraFormat		veraSpecial
-HiLink veraCppString		veraString
-HiLink veraCommentL		veraComment
-HiLink veraCommentStart		veraComment
-HiLink veraLabel			Label
-HiLink veraUserLabel		Label
-HiLink veraConditional		Conditional
-HiLink veraRepeat		Repeat
-HiLink veraCharacter		Character
-HiLink veraSpecialCharacter	veraSpecial
-HiLink veraNumber		Number
-HiLink veraOctal			Number
-HiLink veraOctalZero		PreProc	 " link this to Error if you want
-HiLink veraFloat			Float
-HiLink veraOctalError		veraError
-HiLink veraParenError		veraError
-HiLink veraErrInParen		veraError
-HiLink veraErrInBracket		veraError
-HiLink veraCommentError		veraError
-HiLink veraCommentStartError	veraError
-HiLink veraSpaceError         SpaceError
-HiLink veraSpecialError		veraError
-HiLink veraOperator		Operator
-HiLink veraStructure		Structure
-HiLink veraInclude		Include
-HiLink veraPreProc		PreProc
-HiLink veraDefine		Macro
-HiLink veraIncluded		veraString
-HiLink veraError			Error
-HiLink veraStatement		Statement
-HiLink veraPreCondit		PreCondit
-HiLink veraType			Type
-" HiLink veraConstant		Constant
-HiLink veraConstant		Keyword
-HiLink veraUserConstant		Constant
-HiLink veraCommentString		veraString
-HiLink veraComment2String	veraString
-HiLink veraCommentSkip		veraComment
-HiLink veraString		String
-HiLink veraComment		Comment
-HiLink veraSpecial		SpecialChar
-HiLink veraTodo			Todo
-HiLink veraCppSkip		veraCppOut
-HiLink veraCppOut2		veraCppOut
-HiLink veraCppOut		Comment
+hi def link veraFormat		veraSpecial
+hi def link veraCppString		veraString
+hi def link veraCommentL		veraComment
+hi def link veraCommentStart		veraComment
+hi def link veraLabel			Label
+hi def link veraUserLabel		Label
+hi def link veraConditional		Conditional
+hi def link veraRepeat		Repeat
+hi def link veraCharacter		Character
+hi def link veraSpecialCharacter	veraSpecial
+hi def link veraNumber		Number
+hi def link veraOctal			Number
+hi def link veraOctalZero		PreProc	 " link this to Error if you want
+hi def link veraFloat			Float
+hi def link veraOctalError		veraError
+hi def link veraParenError		veraError
+hi def link veraErrInParen		veraError
+hi def link veraErrInBracket		veraError
+hi def link veraCommentError		veraError
+hi def link veraCommentStartError	veraError
+hi def link veraSpaceError         SpaceError
+hi def link veraSpecialError		veraError
+hi def link veraOperator		Operator
+hi def link veraStructure		Structure
+hi def link veraInclude		Include
+hi def link veraPreProc		PreProc
+hi def link veraDefine		Macro
+hi def link veraIncluded		veraString
+hi def link veraError			Error
+hi def link veraStatement		Statement
+hi def link veraPreCondit		PreCondit
+hi def link veraType			Type
+" hi def link veraConstant		Constant
+hi def link veraConstant		Keyword
+hi def link veraUserConstant		Constant
+hi def link veraCommentString		veraString
+hi def link veraComment2String	veraString
+hi def link veraCommentSkip		veraComment
+hi def link veraString		String
+hi def link veraComment		Comment
+hi def link veraSpecial		SpecialChar
+hi def link veraTodo			Todo
+hi def link veraCppSkip		veraCppOut
+hi def link veraCppOut2		veraCppOut
+hi def link veraCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "vera"
 
diff --git a/runtime/syntax/verilog.vim b/runtime/syntax/verilog.vim
--- a/runtime/syntax/verilog.vim
+++ b/runtime/syntax/verilog.vim
@@ -96,25 +96,23 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogCharacter       Character
-HiLink verilogConditional     Conditional
-HiLink verilogRepeat          Repeat
-HiLink verilogString          String
-HiLink verilogTodo            Todo
-HiLink verilogComment         Comment
-HiLink verilogConstant        Constant
-HiLink verilogLabel           Label
-HiLink verilogNumber          Number
-HiLink verilogOperator        Special
-HiLink verilogStatement       Statement
-HiLink verilogGlobal          Define
-HiLink verilogDirective       SpecialComment
-HiLink verilogEscape		 Special
+hi def link verilogCharacter       Character
+hi def link verilogConditional     Conditional
+hi def link verilogRepeat          Repeat
+hi def link verilogString          String
+hi def link verilogTodo            Todo
+hi def link verilogComment         Comment
+hi def link verilogConstant        Constant
+hi def link verilogLabel           Label
+hi def link verilogNumber          Number
+hi def link verilogOperator        Special
+hi def link verilogStatement       Statement
+hi def link verilogGlobal          Define
+hi def link verilogDirective       SpecialComment
+hi def link verilogEscape		 Special
 
-delcommand HiLink
 
 let b:current_syntax = "verilog"
 
diff --git a/runtime/syntax/verilogams.vim b/runtime/syntax/verilogams.vim
--- a/runtime/syntax/verilogams.vim
+++ b/runtime/syntax/verilogams.vim
@@ -107,27 +107,25 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogamsCharacter    Character
-HiLink verilogamsConditional  Conditional
-HiLink verilogamsRepeat       Repeat
-HiLink verilogamsString       String
-HiLink verilogamsTodo         Todo
-HiLink verilogamsComment      Comment
-HiLink verilogamsConstant     Constant
-HiLink verilogamsLabel        Label
-HiLink verilogamsNumber       Number
-HiLink verilogamsOperator     Special
-HiLink verilogamsStatement    Statement
-HiLink verilogamsGlobal       Define
-HiLink verilogamsDirective    SpecialComment
-HiLink verilogamsEscape       Special
-HiLink verilogamsType         Type
-HiLink verilogamsSystask      Function
+hi def link verilogamsCharacter    Character
+hi def link verilogamsConditional  Conditional
+hi def link verilogamsRepeat       Repeat
+hi def link verilogamsString       String
+hi def link verilogamsTodo         Todo
+hi def link verilogamsComment      Comment
+hi def link verilogamsConstant     Constant
+hi def link verilogamsLabel        Label
+hi def link verilogamsNumber       Number
+hi def link verilogamsOperator     Special
+hi def link verilogamsStatement    Statement
+hi def link verilogamsGlobal       Define
+hi def link verilogamsDirective    SpecialComment
+hi def link verilogamsEscape       Special
+hi def link verilogamsType         Type
+hi def link verilogamsSystask      Function
 
-delcommand HiLink
 
 let b:current_syntax = "verilogams"
 
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -234,26 +234,24 @@ syn sync	minlines=600
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	vhdlSpecial	Special
-HiLink	vhdlStatement   Statement
-HiLink	vhdlCharacter   Character
-HiLink	vhdlString	String
-HiLink	vhdlVector	Number
-HiLink	vhdlBoolean	Number
-HiLink	vhdlTodo	Todo
-HiLink	vhdlFixme	Fixme
-HiLink	vhdlComment	Comment
-HiLink	vhdlNumber	Number
-HiLink	vhdlTime	Number
-HiLink	vhdlType	Type
-HiLink	vhdlOperator    Operator
-HiLink	vhdlError	Error
-HiLink	vhdlAttribute   Special
-HiLink	vhdlPreProc	PreProc
+hi def link vhdlSpecial	Special
+hi def link vhdlStatement   Statement
+hi def link vhdlCharacter   Character
+hi def link vhdlString	String
+hi def link vhdlVector	Number
+hi def link vhdlBoolean	Number
+hi def link vhdlTodo	Todo
+hi def link vhdlFixme	Fixme
+hi def link vhdlComment	Comment
+hi def link vhdlNumber	Number
+hi def link vhdlTime	Number
+hi def link vhdlType	Type
+hi def link vhdlOperator    Operator
+hi def link vhdlError	Error
+hi def link vhdlAttribute   Special
+hi def link vhdlPreProc	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "vhdl"
 
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 7.4 script
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	August 26, 2016
-" Version:	7.4-52
+" Last Change:	August 31, 2016
+" Version:	7.4-53
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -169,8 +169,8 @@ syn match vimNumber	"\%(^\|[^a-zA-Z]\)\z
 syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
 syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
 syn match vimVar        contained	"\<\h[a-zA-Z0-9#_]*\>"
-syn match vimVar		"\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
-syn match vimFBVar      contained   "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimFBVar      contained   "\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
 syn keyword vimCommand  contained	in
 
 " Insertions And Appends: insert append {{{2
@@ -793,167 +793,169 @@ syn sync match vimAugroupSyncA	groupther
 " Highlighting Settings {{{2
 " ====================
 
-if !exists("g:vimsyn_noerror")
- hi def link vimBehaveError	vimError
- hi def link vimCollClassErr	vimError
- hi def link vimErrSetting	vimError
- hi def link vimEmbedError	vimError
- hi def link vimFTError	vimError
- hi def link vimFunctionError	vimError
- hi def link vimFunc         	vimError
- hi def link vimHiAttribList	vimError
- hi def link vimHiCtermError	vimError
- hi def link vimHiKeyError	vimError
- hi def link vimKeyCodeError	vimError
- hi def link vimMapModErr	vimError
- hi def link vimSubstFlagErr	vimError
- hi def link vimSynCaseError	vimError
- hi def link vimBufnrWarn	vimWarn
-endif
+if !exists("skip_vim_syntax_inits")
+ if !exists("g:vimsyn_noerror")
+  hi def link vimBehaveError	vimError
+  hi def link vimCollClassErr	vimError
+  hi def link vimErrSetting	vimError
+  hi def link vimEmbedError	vimError
+  hi def link vimFTError	vimError
+  hi def link vimFunctionError	vimError
+  hi def link vimFunc         	vimError
+  hi def link vimHiAttribList	vimError
+  hi def link vimHiCtermError	vimError
+  hi def link vimHiKeyError	vimError
+  hi def link vimKeyCodeError	vimError
+  hi def link vimMapModErr	vimError
+  hi def link vimSubstFlagErr	vimError
+  hi def link vimSynCaseError	vimError
+  hi def link vimBufnrWarn	vimWarn
+ endif
 
-hi def link vimAbb	vimCommand
-hi def link vimAddress	vimMark
-hi def link vimAugroupError	vimError
-hi def link vimAugroupKey	vimCommand
-hi def link vimAuHighlight	vimHighlight
-hi def link vimAutoCmdOpt	vimOption
-hi def link vimAutoCmd	vimCommand
-hi def link vimAutoEvent	Type
-hi def link vimAutoSet	vimCommand
-hi def link vimBehaveModel	vimBehave
-hi def link vimBehave	vimCommand
-hi def link vimBracket	Delimiter
-hi def link vimCmplxRepeat	SpecialChar
-hi def link vimCommand	Statement
-hi def link vimComment	Comment
-hi def link vimCommentString	vimString
-hi def link vimCommentTitle	PreProc
-hi def link vimCondHL	vimCommand
-hi def link vimContinue	Special
-hi def link vimCtrlChar	SpecialChar
-hi def link vimEchoHLNone	vimGroup
-hi def link vimEchoHL	vimCommand
-hi def link vimElseIfErr	Error
-hi def link vimElseif	vimCondHL
-hi def link vimEnvvar	PreProc
-hi def link vimError	Error
-hi def link vimFBVar	vimVar
-hi def link vimFgBgAttrib	vimHiAttrib
-hi def link vimFold	Folded
-hi def link vimFTCmd	vimCommand
-hi def link vimFTOption	vimSynType
-hi def link vimFuncKey	vimCommand
-hi def link vimFuncName	Function
-hi def link vimFuncSID	Special
-hi def link vimFuncVar	Identifier
-hi def link vimGroupAdd	vimSynOption
-hi def link vimGroupName	vimGroup
-hi def link vimGroupRem	vimSynOption
-hi def link vimGroupSpecial	Special
-hi def link vimGroup	Type
-hi def link vimHiAttrib	PreProc
-hi def link vimHiClear	vimHighlight
-hi def link vimHiCtermFgBg	vimHiTerm
-hi def link vimHiCTerm	vimHiTerm
-hi def link vimHighlight	vimCommand
-hi def link vimHiGroup	vimGroupName
-hi def link vimHiGuiFgBg	vimHiTerm
-hi def link vimHiGuiFont	vimHiTerm
-hi def link vimHiGuiRgb	vimNumber
-hi def link vimHiGui	vimHiTerm
-hi def link vimHiNmbr	Number
-hi def link vimHiStartStop	vimHiTerm
-hi def link vimHiTerm	Type
-hi def link vimHLGroup	vimGroup
-hi def link vimHLMod	PreProc
-hi def link vimInsert	vimString
-hi def link vimIskSep	Delimiter
-hi def link vimKeyCode	vimSpecFile
-hi def link vimKeyword	Statement
-hi def link vimLet	vimCommand
-hi def link vimLineComment	vimComment
-hi def link vimMapBang	vimCommand
-hi def link vimMapModKey	vimFuncSID
-hi def link vimMapMod	vimBracket
-hi def link vimMap	vimCommand
-hi def link vimMark	Number
-hi def link vimMarkNumber	vimNumber
-hi def link vimMenuMod	vimMapMod
-hi def link vimMenuNameMore	vimMenuName
-hi def link vimMenuName	PreProc
-hi def link vimMtchComment	vimComment
-hi def link vimNorm	vimCommand
-hi def link vimNotation	Special
-hi def link vimNotFunc	vimCommand
-hi def link vimNotPatSep	vimString
-hi def link vimNumber	Number
-hi def link vimOperError	Error
-hi def link vimOper	Operator
-hi def link vimOption	PreProc
-hi def link vimParenSep	Delimiter
-hi def link vimPatSepErr	vimPatSep
-hi def link vimPatSepR	vimPatSep
-hi def link vimPatSep	SpecialChar
-hi def link vimPatSepZone	vimString
-hi def link vimPatSepZ	vimPatSep
-hi def link vimPattern	Type
-hi def link vimPlainMark	vimMark
-hi def link vimPlainRegister	vimRegister
-hi def link vimRegister	SpecialChar
-hi def link vimScriptDelim	Comment
-hi def link vimSearchDelim	Statement
-hi def link vimSearch	vimString
-hi def link vimSep	Delimiter
-hi def link vimSetMod	vimOption
-hi def link vimSetSep	Statement
-hi def link vimSetString	vimString
-hi def link vimSpecFile	Identifier
-hi def link vimSpecFileMod	vimSpecFile
-hi def link vimSpecial	Type
-hi def link vimStatement	Statement
-hi def link vimStringCont	vimString
-hi def link vimString	String
-hi def link vimSubst1	vimSubst
-hi def link vimSubstDelim	Delimiter
-hi def link vimSubstFlags	Special
-hi def link vimSubstSubstr	SpecialChar
-hi def link vimSubstTwoBS	vimString
-hi def link vimSubst	vimCommand
-hi def link vimSynCaseError	Error
-hi def link vimSynCase	Type
-hi def link vimSyncC	Type
-hi def link vimSyncError	Error
-hi def link vimSyncGroupName	vimGroupName
-hi def link vimSyncGroup	vimGroupName
-hi def link vimSyncKey	Type
-hi def link vimSyncNone	Type
-hi def link vimSynContains	vimSynOption
-hi def link vimSynError	Error
-hi def link vimSynKeyContainedin	vimSynContains
-hi def link vimSynKeyOpt	vimSynOption
-hi def link vimSynMtchGrp	vimSynOption
-hi def link vimSynMtchOpt	vimSynOption
-hi def link vimSynNextgroup	vimSynOption
-hi def link vimSynNotPatRange	vimSynRegPat
-hi def link vimSynOption	Special
-hi def link vimSynPatRange	vimString
-hi def link vimSynRegOpt	vimSynOption
-hi def link vimSynRegPat	vimString
-hi def link vimSynReg	Type
-hi def link vimSyntax	vimCommand
-hi def link vimSynType	vimSpecial
-hi def link vimTodo	Todo
-hi def link vimUnmap	vimMap
-hi def link vimUserAttrbCmpltFunc	Special
-hi def link vimUserAttrbCmplt	vimSpecial
-hi def link vimUserAttrbKey	vimOption
-hi def link vimUserAttrb	vimSpecial
-hi def link vimUserAttrbError	Error
-hi def link vimUserCmdError	Error
-hi def link vimUserCommand	vimCommand
-hi def link vimUserFunc	Normal
-hi def link vimVar	Identifier
-hi def link vimWarn	WarningMsg
+ hi def link vimAbb	vimCommand
+ hi def link vimAddress	vimMark
+ hi def link vimAugroupError	vimError
+ hi def link vimAugroupKey	vimCommand
+ hi def link vimAuHighlight	vimHighlight
+ hi def link vimAutoCmdOpt	vimOption
+ hi def link vimAutoCmd	vimCommand
+ hi def link vimAutoEvent	Type
+ hi def link vimAutoSet	vimCommand
+ hi def link vimBehaveModel	vimBehave
+ hi def link vimBehave	vimCommand
+ hi def link vimBracket	Delimiter
+ hi def link vimCmplxRepeat	SpecialChar
+ hi def link vimCommand	Statement
+ hi def link vimComment	Comment
+ hi def link vimCommentString	vimString
+ hi def link vimCommentTitle	PreProc
+ hi def link vimCondHL	vimCommand
+ hi def link vimContinue	Special
+ hi def link vimCtrlChar	SpecialChar
+ hi def link vimEchoHLNone	vimGroup
+ hi def link vimEchoHL	vimCommand
+ hi def link vimElseIfErr	Error
+ hi def link vimElseif	vimCondHL
+ hi def link vimEnvvar	PreProc
+ hi def link vimError	Error
+ hi def link vimFBVar	vimVar
+ hi def link vimFgBgAttrib	vimHiAttrib
+ hi def link vimFold	Folded
+ hi def link vimFTCmd	vimCommand
+ hi def link vimFTOption	vimSynType
+ hi def link vimFuncKey	vimCommand
+ hi def link vimFuncName	Function
+ hi def link vimFuncSID	Special
+ hi def link vimFuncVar	Identifier
+ hi def link vimGroupAdd	vimSynOption
+ hi def link vimGroupName	vimGroup
+ hi def link vimGroupRem	vimSynOption
+ hi def link vimGroupSpecial	Special
+ hi def link vimGroup	Type
+ hi def link vimHiAttrib	PreProc
+ hi def link vimHiClear	vimHighlight
+ hi def link vimHiCtermFgBg	vimHiTerm
+ hi def link vimHiCTerm	vimHiTerm
+ hi def link vimHighlight	vimCommand
+ hi def link vimHiGroup	vimGroupName
+ hi def link vimHiGuiFgBg	vimHiTerm
+ hi def link vimHiGuiFont	vimHiTerm
+ hi def link vimHiGuiRgb	vimNumber
+ hi def link vimHiGui	vimHiTerm
+ hi def link vimHiNmbr	Number
+ hi def link vimHiStartStop	vimHiTerm
+ hi def link vimHiTerm	Type
+ hi def link vimHLGroup	vimGroup
+ hi def link vimHLMod	PreProc
+ hi def link vimInsert	vimString
+ hi def link vimIskSep	Delimiter
+ hi def link vimKeyCode	vimSpecFile
+ hi def link vimKeyword	Statement
+ hi def link vimLet	vimCommand
+ hi def link vimLineComment	vimComment
+ hi def link vimMapBang	vimCommand
+ hi def link vimMapModKey	vimFuncSID
+ hi def link vimMapMod	vimBracket
+ hi def link vimMap	vimCommand
+ hi def link vimMark	Number
+ hi def link vimMarkNumber	vimNumber
+ hi def link vimMenuMod	vimMapMod
+ hi def link vimMenuNameMore	vimMenuName
+ hi def link vimMenuName	PreProc
+ hi def link vimMtchComment	vimComment
+ hi def link vimNorm	vimCommand
+ hi def link vimNotation	Special
+ hi def link vimNotFunc	vimCommand
+ hi def link vimNotPatSep	vimString
+ hi def link vimNumber	Number
+ hi def link vimOperError	Error
+ hi def link vimOper	Operator
+ hi def link vimOption	PreProc
+ hi def link vimParenSep	Delimiter
+ hi def link vimPatSepErr	vimPatSep
+ hi def link vimPatSepR	vimPatSep
+ hi def link vimPatSep	SpecialChar
+ hi def link vimPatSepZone	vimString
+ hi def link vimPatSepZ	vimPatSep
+ hi def link vimPattern	Type
+ hi def link vimPlainMark	vimMark
+ hi def link vimPlainRegister	vimRegister
+ hi def link vimRegister	SpecialChar
+ hi def link vimScriptDelim	Comment
+ hi def link vimSearchDelim	Statement
+ hi def link vimSearch	vimString
+ hi def link vimSep	Delimiter
+ hi def link vimSetMod	vimOption
+ hi def link vimSetSep	Statement
+ hi def link vimSetString	vimString
+ hi def link vimSpecFile	Identifier
+ hi def link vimSpecFileMod	vimSpecFile
+ hi def link vimSpecial	Type
+ hi def link vimStatement	Statement
+ hi def link vimStringCont	vimString
+ hi def link vimString	String
+ hi def link vimSubst1	vimSubst
+ hi def link vimSubstDelim	Delimiter
+ hi def link vimSubstFlags	Special
+ hi def link vimSubstSubstr	SpecialChar
+ hi def link vimSubstTwoBS	vimString
+ hi def link vimSubst	vimCommand
+ hi def link vimSynCaseError	Error
+ hi def link vimSynCase	Type
+ hi def link vimSyncC	Type
+ hi def link vimSyncError	Error
+ hi def link vimSyncGroupName	vimGroupName
+ hi def link vimSyncGroup	vimGroupName
+ hi def link vimSyncKey	Type
+ hi def link vimSyncNone	Type
+ hi def link vimSynContains	vimSynOption
+ hi def link vimSynError	Error
+ hi def link vimSynKeyContainedin	vimSynContains
+ hi def link vimSynKeyOpt	vimSynOption
+ hi def link vimSynMtchGrp	vimSynOption
+ hi def link vimSynMtchOpt	vimSynOption
+ hi def link vimSynNextgroup	vimSynOption
+ hi def link vimSynNotPatRange	vimSynRegPat
+ hi def link vimSynOption	Special
+ hi def link vimSynPatRange	vimString
+ hi def link vimSynRegOpt	vimSynOption
+ hi def link vimSynRegPat	vimString
+ hi def link vimSynReg	Type
+ hi def link vimSyntax	vimCommand
+ hi def link vimSynType	vimSpecial
+ hi def link vimTodo	Todo
+ hi def link vimUnmap	vimMap
+ hi def link vimUserAttrbCmpltFunc	Special
+ hi def link vimUserAttrbCmplt	vimSpecial
+ hi def link vimUserAttrbKey	vimOption
+ hi def link vimUserAttrb	vimSpecial
+ hi def link vimUserAttrbError	Error
+ hi def link vimUserCmdError	Error
+ hi def link vimUserCommand	vimCommand
+ hi def link vimUserFunc	Normal
+ hi def link vimVar	Identifier
+ hi def link vimWarn	WarningMsg
+endif
 
 " Current Syntax Variable: {{{2
 let b:current_syntax = "vim"
diff --git a/runtime/syntax/virata.vim b/runtime/syntax/virata.vim
--- a/runtime/syntax/virata.vim
+++ b/runtime/syntax/virata.vim
@@ -155,54 +155,52 @@ syn sync minlines=50		"for multiple regi
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink virataDefSubstError	virataPreProcError
-HiLink virataDefSubst		virataPreProc
-HiLink virataInAlter		virataOperator
-HiLink virataInExec		virataOperator
-HiLink virataInExport		virataOperator
-HiLink virataInImport		virataOperator
-HiLink virataInInstance	virataOperator
-HiLink virataInMake		virataOperator
-HiLink virataInModule		virataOperator
-HiLink virataInProcess	virataOperator
-HiLink virataInMacAddr	virataHexNumber
+hi def link virataDefSubstError	virataPreProcError
+hi def link virataDefSubst		virataPreProc
+hi def link virataInAlter		virataOperator
+hi def link virataInExec		virataOperator
+hi def link virataInExport		virataOperator
+hi def link virataInImport		virataOperator
+hi def link virataInInstance	virataOperator
+hi def link virataInMake		virataOperator
+hi def link virataInModule		virataOperator
+hi def link virataInProcess	virataOperator
+hi def link virataInMacAddr	virataHexNumber
 
 " Comment Group:
-HiLink virataComment		Comment
-HiLink virataSpclComment	SpecialComment
-HiLink virataInCommentTodo	Todo
+hi def link virataComment		Comment
+hi def link virataSpclComment	SpecialComment
+hi def link virataInCommentTodo	Todo
 
 " Constant Group:
-HiLink virataString		String
-HiLink virataStringError	Error
-HiLink virataCharacter	Character
-HiLink virataSpclChar		Special
-HiLink virataDecNumber	Number
-HiLink virataHexNumber	Number
-HiLink virataSizeNumber	Number
-HiLink virataNumberError	Error
+hi def link virataString		String
+hi def link virataStringError	Error
+hi def link virataCharacter	Character
+hi def link virataSpclChar		Special
+hi def link virataDecNumber	Number
+hi def link virataHexNumber	Number
+hi def link virataSizeNumber	Number
+hi def link virataNumberError	Error
 
 " Identifier Group:
-HiLink virataIdentError	Error
+hi def link virataIdentError	Error
 
 " PreProc Group:
-HiLink virataPreProc		PreProc
-HiLink virataDefine		Define
-HiLink virataInclude		Include
-HiLink virataPreCondit	PreCondit
-HiLink virataPreProcError	Error
-HiLink virataPreProcWarn	Todo
+hi def link virataPreProc		PreProc
+hi def link virataDefine		Define
+hi def link virataInclude		Include
+hi def link virataPreCondit	PreCondit
+hi def link virataPreProcError	Error
+hi def link virataPreProcWarn	Todo
 
 " Directive Group:
-HiLink virataStatement	Statement
-HiLink virataCfgStatement	Statement
-HiLink virataOperator		Operator
-HiLink virataDirective	Keyword
+hi def link virataStatement	Statement
+hi def link virataCfgStatement	Statement
+hi def link virataOperator		Operator
+hi def link virataDirective	Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "virata"
 
diff --git a/runtime/syntax/vmasm.vim b/runtime/syntax/vmasm.vim
--- a/runtime/syntax/vmasm.vim
+++ b/runtime/syntax/vmasm.vim
@@ -194,7 +194,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -206,34 +205,33 @@ command -nargs=+ HiLink hi def link <arg
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink vmasmComment		Comment
-HiLink vmasmTodo		Todo
+hi def link vmasmComment		Comment
+hi def link vmasmTodo		Todo
 
-HiLink vmasmhexNumber		Number		" Constant
-HiLink vmasmoctNumber		Number		" Constant
-HiLink vmasmbinNumber		Number		" Constant
-HiLink vmasmdecNumber		Number		" Constant
-HiLink vmasmfloatNumber	Number		" Constant
+hi def link vmasmhexNumber		Number		" Constant
+hi def link vmasmoctNumber		Number		" Constant
+hi def link vmasmbinNumber		Number		" Constant
+hi def link vmasmdecNumber		Number		" Constant
+hi def link vmasmfloatNumber	Number		" Constant
 
-"  HiLink vmasmString		String		" Constant
+"  hi def link vmasmString		String		" Constant
 
-HiLink vmasmReg		Identifier
-HiLink vmasmOperator		Identifier
+hi def link vmasmReg		Identifier
+hi def link vmasmOperator		Identifier
 
-HiLink vmasmInclude		Include		" PreProc
-HiLink vmasmMacro		Macro		" PreProc
-" HiLink vmasmMacroParam	Keyword		" Statement
+hi def link vmasmInclude		Include		" PreProc
+hi def link vmasmMacro		Macro		" PreProc
+" hi def link vmasmMacroParam	Keyword		" Statement
 
-HiLink vmasmDirective		Special
-HiLink vmasmPreCond		Special
+hi def link vmasmDirective		Special
+hi def link vmasmPreCond		Special
 
 
-HiLink vmasmOpcode		Statement
-HiLink vmasmCond		Conditional	" Statement
-HiLink vmasmRepeat		Repeat		" Statement
+hi def link vmasmOpcode		Statement
+hi def link vmasmCond		Conditional	" Statement
+hi def link vmasmRepeat		Repeat		" Statement
 
-HiLink vmasmLabel		Type
-delcommand HiLink
+hi def link vmasmLabel		Type
 
 let b:current_syntax = "vmasm"
 
diff --git a/runtime/syntax/vrml.vim b/runtime/syntax/vrml.vim
--- a/runtime/syntax/vrml.vim
+++ b/runtime/syntax/vrml.vim
@@ -196,28 +196,26 @@ syn region VRMLString start=+"+ skip=+\\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink VRMLCharacter  VRMLString
-HiLink VRMLSpecialCharacter VRMLSpecial
-HiLink VRMLNumber     VRMLString
-HiLink VRMLValues     VRMLString
-HiLink VRMLString     String
-HiLink VRMLSpecial    Special
-HiLink VRMLComment    Comment
-HiLink VRMLNodes      Statement
-HiLink VRMLFields     Type
-HiLink VRMLEvents     Type
-HiLink VRMLfTypes     LineNr
+hi def link VRMLCharacter  VRMLString
+hi def link VRMLSpecialCharacter VRMLSpecial
+hi def link VRMLNumber     VRMLString
+hi def link VRMLValues     VRMLString
+hi def link VRMLString     String
+hi def link VRMLSpecial    Special
+hi def link VRMLComment    Comment
+hi def link VRMLNodes      Statement
+hi def link VRMLFields     Type
+hi def link VRMLEvents     Type
+hi def link VRMLfTypes     LineNr
 "  hi     VRMLfTypes     ctermfg=6 guifg=Brown
-HiLink VRMLInstances  PreCondit
-HiLink VRMLRoutes     PreCondit
-HiLink VRMLProtos     PreProc
-HiLink VRMLRouteNode  Identifier
-HiLink VRMLInstName   Identifier
-HiLink VRMLTypes      Identifier
+hi def link VRMLInstances  PreCondit
+hi def link VRMLRoutes     PreCondit
+hi def link VRMLProtos     PreProc
+hi def link VRMLRouteNode  Identifier
+hi def link VRMLInstName   Identifier
+hi def link VRMLTypes      Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "vrml"
 
diff --git a/runtime/syntax/vsejcl.vim b/runtime/syntax/vsejcl.vim
--- a/runtime/syntax/vsejcl.vim
+++ b/runtime/syntax/vsejcl.vim
@@ -21,17 +21,15 @@ syn match vsejclParms /(.\{-})/ containe
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vsejclComment		Comment
-HiLink vsejclField		Type
-HiLink vsejclKeyword		Statement
-HiLink vsejclObject		Constant
-HiLink vsejclString		Constant
-HiLink vsejclMisc			Special
-HiLink vsejclParms		Constant
+hi def link vsejclComment		Comment
+hi def link vsejclField		Type
+hi def link vsejclKeyword		Statement
+hi def link vsejclObject		Constant
+hi def link vsejclString		Constant
+hi def link vsejclMisc			Special
+hi def link vsejclParms		Constant
 
-delcommand HiLink
 
 let b:current_syntax = "vsejcl"
 
diff --git a/runtime/syntax/wdiff.vim b/runtime/syntax/wdiff.vim
--- a/runtime/syntax/wdiff.vim
+++ b/runtime/syntax/wdiff.vim
@@ -21,11 +21,9 @@ syn region wdiffNew start="{+" end="+}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink wdiffOld       Special
-HiLink wdiffNew       Identifier
+hi def link wdiffOld       Special
+hi def link wdiffNew       Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "wdiff"
diff --git a/runtime/syntax/webmacro.vim b/runtime/syntax/webmacro.vim
--- a/runtime/syntax/webmacro.vim
+++ b/runtime/syntax/webmacro.vim
@@ -45,22 +45,20 @@ syn match webmacroHash "[#{}\$]" contain
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webmacroComment CommentTitle
-HiLink webmacroVariable PreProc
-HiLink webmacroIf webmacroStatement
-HiLink webmacroForeach webmacroStatement
-HiLink webmacroSet webmacroStatement
-HiLink webmacroInclude webmacroStatement
-HiLink webmacroParse webmacroStatement
-HiLink webmacroStatement Function
-HiLink webmacroNumber Number
-HiLink webmacroBoolean Boolean
-HiLink webmacroSpecial Special
-HiLink webmacroString String
-HiLink webmacroBracesError Error
-delcommand HiLink
+hi def link webmacroComment CommentTitle
+hi def link webmacroVariable PreProc
+hi def link webmacroIf webmacroStatement
+hi def link webmacroForeach webmacroStatement
+hi def link webmacroSet webmacroStatement
+hi def link webmacroInclude webmacroStatement
+hi def link webmacroParse webmacroStatement
+hi def link webmacroStatement Function
+hi def link webmacroNumber Number
+hi def link webmacroBoolean Boolean
+hi def link webmacroSpecial Special
+hi def link webmacroString String
+hi def link webmacroBracesError Error
 
 let b:current_syntax = "webmacro"
 
diff --git a/runtime/syntax/winbatch.vim b/runtime/syntax/winbatch.vim
--- a/runtime/syntax/winbatch.vim
+++ b/runtime/syntax/winbatch.vim
@@ -156,20 +156,18 @@ syn keyword winbatchImplicit xsendmessag
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink winbatchLabel		PreProc
-HiLink winbatchCtl		Operator
-HiLink winbatchStatement	Statement
-HiLink winbatchTodo		Todo
-HiLink winbatchString		String
-HiLink winbatchVar		Type
-HiLink winbatchComment	Comment
-HiLink winbatchImplicit	Special
-HiLink winbatchNumber		Number
-HiLink winbatchConstant	StorageClass
+hi def link winbatchLabel		PreProc
+hi def link winbatchCtl		Operator
+hi def link winbatchStatement	Statement
+hi def link winbatchTodo		Todo
+hi def link winbatchString		String
+hi def link winbatchVar		Type
+hi def link winbatchComment	Comment
+hi def link winbatchImplicit	Special
+hi def link winbatchNumber		Number
+hi def link winbatchConstant	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "winbatch"
 
diff --git a/runtime/syntax/wml.vim b/runtime/syntax/wml.vim
--- a/runtime/syntax/wml.vim
+++ b/runtime/syntax/wml.vim
@@ -130,23 +130,21 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink wmlNextLine	Special
-HiLink wmlUse		Include
-HiLink wmlUsed	String
-HiLink wmlBody	Special
-HiLink wmlDiverted	Label
-HiLink wmlDivert	Delimiter
-HiLink wmlDivertEnd	Delimiter
-HiLink wmlLocationId	Label
-HiLink wmlLocation	Delimiter
-" HiLink wmlLocationed	Delimiter
-HiLink wmlDefineName	String
-HiLink wmlComment	Comment
-HiLink wmlInclude	Include
-HiLink wmlSharpBang	PreProc
+hi def link wmlNextLine	Special
+hi def link wmlUse		Include
+hi def link wmlUsed	String
+hi def link wmlBody	Special
+hi def link wmlDiverted	Label
+hi def link wmlDivert	Delimiter
+hi def link wmlDivertEnd	Delimiter
+hi def link wmlLocationId	Label
+hi def link wmlLocation	Delimiter
+" hi def link wmlLocationed	Delimiter
+hi def link wmlDefineName	String
+hi def link wmlComment	Comment
+hi def link wmlInclude	Include
+hi def link wmlSharpBang	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "wml"
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -77,38 +77,36 @@ syn cluster wsmlTop add=wsmlString,wsmlC
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink wsmlHeader			TypeDef
-HiLink wsmlNamespace			TypeDef
-HiLink wsmlOntology			Statement
-HiLink wsmlAxiom			TypeDef
-HiLink wsmlService			TypeDef
-HiLink wsmlNFP			TypeDef
-HiLink wsmlTopLevel			TypeDef
-HiLink wsmlMediation			TypeDef 
-HiLink wsmlBehavioral		TypeDef
-HiLink wsmlChoreographyPri		TypeDef
-HiLink wsmlChoreographySec		Operator
-HiLink wsmlChoreographyTer		Special
-HiLink wsmlString			String
-HiLink wsmlIdentifier		Normal 
-HiLink wsmlSqName                     Normal
-HiLink wsmlVariable			Define
-HiLink wsmlKeywordsInsideLEs		Operator
-HiLink wsmlOperator			Operator
-HiLink wsmlBrace			Operator
-HiLink wsmlCharacter			Character
-HiLink wsmlNumber			Number
-HiLink wsmlDataTypes			Special
-HiLink wsmlComment			Comment
-HiLink wsmlDocComment		Comment
-HiLink wsmlLineComment		Comment
-HiLink wsmlTodo			Todo
-HiLink wsmlFixMe			Error
-HiLink wsmlCommentTitle		SpecialComment
-HiLink wsmlCommentStar		wsmlComment
+hi def link wsmlHeader			TypeDef
+hi def link wsmlNamespace			TypeDef
+hi def link wsmlOntology			Statement
+hi def link wsmlAxiom			TypeDef
+hi def link wsmlService			TypeDef
+hi def link wsmlNFP			TypeDef
+hi def link wsmlTopLevel			TypeDef
+hi def link wsmlMediation			TypeDef 
+hi def link wsmlBehavioral		TypeDef
+hi def link wsmlChoreographyPri		TypeDef
+hi def link wsmlChoreographySec		Operator
+hi def link wsmlChoreographyTer		Special
+hi def link wsmlString			String
+hi def link wsmlIdentifier		Normal 
+hi def link wsmlSqName                     Normal
+hi def link wsmlVariable			Define
+hi def link wsmlKeywordsInsideLEs		Operator
+hi def link wsmlOperator			Operator
+hi def link wsmlBrace			Operator
+hi def link wsmlCharacter			Character
+hi def link wsmlNumber			Number
+hi def link wsmlDataTypes			Special
+hi def link wsmlComment			Comment
+hi def link wsmlDocComment		Comment
+hi def link wsmlLineComment		Comment
+hi def link wsmlTodo			Todo
+hi def link wsmlFixMe			Error
+hi def link wsmlCommentTitle		SpecialComment
+hi def link wsmlCommentStar		wsmlComment
 
-delcommand HiLink
 
 let b:current_syntax = "wsml"
 let b:spell_options="contained"
diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim
--- a/runtime/syntax/xdefaults.vim
+++ b/runtime/syntax/xdefaults.vim
@@ -107,27 +107,25 @@ syn keyword xdefaultsSymbol contained Y_
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink xdefaultsLabel		Type
-HiLink xdefaultsValue		Constant
-HiLink xdefaultsComment	Comment
-HiLink xdefaultsCommentH	xdefaultsComment
-HiLink xdefaultsPreProc	PreProc
-HiLink xdefaultsInclude	xdefaultsPreProc
-HiLink xdefaultsCppSkip	xdefaultsCppOut
-HiLink xdefaultsCppOut2	xdefaultsCppOut
-HiLink xdefaultsCppOut	Comment
-HiLink xdefaultsIncluded	String
-HiLink xdefaultsDefine	Macro
-HiLink xdefaultsSymbol	Statement
-HiLink xdefaultsSpecial	Statement
-HiLink xdefaultsErrorLine	Error
-HiLink xdefaultsCommentError	Error
-HiLink xdefaultsPunct		Normal
-HiLink xdefaultsLineEnd	Special
-HiLink xdefaultsTodo		Todo
+hi def link xdefaultsLabel		Type
+hi def link xdefaultsValue		Constant
+hi def link xdefaultsComment	Comment
+hi def link xdefaultsCommentH	xdefaultsComment
+hi def link xdefaultsPreProc	PreProc
+hi def link xdefaultsInclude	xdefaultsPreProc
+hi def link xdefaultsCppSkip	xdefaultsCppOut
+hi def link xdefaultsCppOut2	xdefaultsCppOut
+hi def link xdefaultsCppOut	Comment
+hi def link xdefaultsIncluded	String
+hi def link xdefaultsDefine	Macro
+hi def link xdefaultsSymbol	Statement
+hi def link xdefaultsSpecial	Statement
+hi def link xdefaultsErrorLine	Error
+hi def link xdefaultsCommentError	Error
+hi def link xdefaultsPunct		Normal
+hi def link xdefaultsLineEnd	Special
+hi def link xdefaultsTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "xdefaults"
 
diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim
--- a/runtime/syntax/xkb.vim
+++ b/runtime/syntax/xkb.vim
@@ -47,35 +47,33 @@ syn keyword xkbTModif default hidden par
 syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xkbModif xkbPreproc
-HiLink xkbTModif xkbPreproc
-HiLink xkbPreproc Preproc
+hi def link xkbModif xkbPreproc
+hi def link xkbTModif xkbPreproc
+hi def link xkbPreproc Preproc
 
-HiLink xkbIdentifier Keyword
-HiLink xkbFunction Function
-HiLink xkbSect Type
-HiLink xkbPhysicalKey Identifier
-HiLink xkbKeyword Keyword
+hi def link xkbIdentifier Keyword
+hi def link xkbFunction Function
+hi def link xkbSect Type
+hi def link xkbPhysicalKey Identifier
+hi def link xkbKeyword Keyword
 
-HiLink xkbComment Comment
-HiLink xkbTodo Todo
+hi def link xkbComment Comment
+hi def link xkbTodo Todo
 
-HiLink xkbConstant Constant
-HiLink xkbString String
+hi def link xkbConstant Constant
+hi def link xkbString String
 
-HiLink xkbSpecialChar xkbSpecial
-HiLink xkbSpecial Special
+hi def link xkbSpecialChar xkbSpecial
+hi def link xkbSpecial Special
 
-HiLink xkbParenError xkbBalancingError
-HiLink xkbBraceError xkbBalancingError
-HiLink xkbBraketError xkbBalancingError
-HiLink xkbBalancingError xkbError
-HiLink xkbCommentStartError xkbCommentError
-HiLink xkbCommentError xkbError
-HiLink xkbError Error
+hi def link xkbParenError xkbBalancingError
+hi def link xkbBraceError xkbBalancingError
+hi def link xkbBraketError xkbBalancingError
+hi def link xkbBalancingError xkbError
+hi def link xkbCommentStartError xkbCommentError
+hi def link xkbCommentError xkbError
+hi def link xkbError Error
 
-delcommand HiLink
 
 let b:current_syntax = "xkb"
diff --git a/runtime/syntax/xmath.vim b/runtime/syntax/xmath.vim
--- a/runtime/syntax/xmath.vim
+++ b/runtime/syntax/xmath.vim
@@ -1,11 +1,12 @@
 " Vim syntax file
 " Language:	xmath (a simulation tool)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Sep 11, 2006
-" Version:	7
+" Last Change:	Aug 31, 2016
+" Version:	9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
 
-" quit when a syntax file was already loaded
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
@@ -191,34 +192,33 @@ syn sync match xmathSyncComment	groupher
 syn sync match xmathSyncComment	groupthere NONE "}#"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_xmath_syntax_inits")
 
-HiLink xmathBraceError	xmathError
-HiLink xmathCmd	xmathStatement
-HiLink xmathCommentBlock	xmathComment
-HiLink xmathCurlyError	xmathError
-HiLink xmathFuncCmd	xmathStatement
-HiLink xmathParenError	xmathError
+  hi def link xmathBraceError	xmathError
+  hi def link xmathCmd	xmathStatement
+  hi def link xmathCommentBlock	xmathComment
+  hi def link xmathCurlyError	xmathError
+  hi def link xmathFuncCmd	xmathStatement
+  hi def link xmathParenError	xmathError
 
-" The default methods for highlighting.  Can be overridden later
-HiLink xmathCharacter	Character
-HiLink xmathComma	Delimiter
-HiLink xmathComment	Comment
-HiLink xmathCommentBlock	Comment
-HiLink xmathConditional	Conditional
-HiLink xmathError	Error
-HiLink xmathFunc	Function
-HiLink xmathLabel	PreProc
-HiLink xmathNumber	Number
-HiLink xmathRepeat	Repeat
-HiLink xmathSpecial	Type
-HiLink xmathSpecialChar	SpecialChar
-HiLink xmathStatement	Statement
-HiLink xmathString	String
-HiLink xmathTodo	Todo
+  " The default methods for highlighting.  Can be overridden later
+  hi def link xmathCharacter	Character
+  hi def link xmathComma	Delimiter
+  hi def link xmathComment	Comment
+  hi def link xmathCommentBlock	Comment
+  hi def link xmathConditional	Conditional
+  hi def link xmathError	Error
+  hi def link xmathFunc	Function
+  hi def link xmathLabel	PreProc
+  hi def link xmathNumber	Number
+  hi def link xmathRepeat	Repeat
+  hi def link xmathSpecial	Type
+  hi def link xmathSpecialChar	SpecialChar
+  hi def link xmathStatement	Statement
+  hi def link xmathString	String
+  hi def link xmathTodo	Todo
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "xmath"
 
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -124,15 +124,13 @@ endif		" has("gui_running")
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xpmType		Type
-HiLink xpmStorageClass	StorageClass
-HiLink xpmTodo		Todo
-HiLink xpmComment		Comment
-HiLink xpmPixelString	String
+hi def link xpmType		Type
+hi def link xpmStorageClass	StorageClass
+hi def link xpmTodo		Todo
+hi def link xpmComment		Comment
+hi def link xpmPixelString	String
 
-delcommand HiLink
 
 let b:current_syntax = "xpm"
 
diff --git a/runtime/syntax/xpm2.vim b/runtime/syntax/xpm2.vim
--- a/runtime/syntax/xpm2.vim
+++ b/runtime/syntax/xpm2.vim
@@ -20,7 +20,6 @@ syn keyword xpm2Todo		TODO FIXME XXX  co
 syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
 
 
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi hi def <args>
 
 if has("gui_running")
@@ -55,7 +54,7 @@ if has("gui_running")
 	if s !~ '/'
 	  exe 'syn match xpm2Values /' . s . '/'
 	endif
-	HiLink xpm2Values Statement
+	hi def link xpm2Values Statement
 
 	let n = 1			" n = color index
 
@@ -104,11 +103,11 @@ if has("gui_running")
 	" now create syntax items
 	" highlight the color string as normal string (no pixel string)
 	exe 'syn match xpm2Col'.n.'Def /'.s.'/ contains=xpm2Col'.n.'inDef'
-	exe 'HiLink xpm2Col'.n.'Def Constant'
+	exe 'hi def link xpm2Col'.n.'Def Constant'
 
 	" but highlight the first whitespace after chars in its color
 	exe 'syn match xpm2Col'.n.'inDef /^'.chars.'/hs=s+'.(cpp).' contained'
-	exe 'HiLink xpm2Col'.n.'inDef xpm2Color'.n
+	exe 'hi def link xpm2Col'.n.'inDef xpm2Color'.n
 
 	" remove the following whitespace from chars
 	let chars = substitute(chars, '\\s\\+$', '', '')
@@ -138,13 +137,12 @@ endif		" has("gui_running")
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 " The default highlighting.
-HiLink xpm2Type		Type
-HiLink xpm2StorageClass	StorageClass
-HiLink xpm2Todo		Todo
-HiLink xpm2Comment		Comment
-HiLink xpm2PixelString	String
+hi def link xpm2Type		Type
+hi def link xpm2StorageClass	StorageClass
+hi def link xpm2Todo		Todo
+hi def link xpm2Comment		Comment
+hi def link xpm2PixelString	String
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "xpm2"
diff --git a/runtime/syntax/xs.vim b/runtime/syntax/xs.vim
--- a/runtime/syntax/xs.vim
+++ b/runtime/syntax/xs.vim
@@ -3243,20 +3243,18 @@ syn keyword xsMacro xiv_iv xuv_uv yystyp
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xsPrivate    Error
-HiLink xsSuperseded Error
-HiLink xsType       Type
-HiLink xsString     String
-HiLink xsConstant   Constant
-HiLink xsException  Exception
-HiLink xsKeyword    Keyword
-HiLink xsFunction   Function
-HiLink xsVariable   Identifier
-HiLink xsMacro      Macro
+hi def link xsPrivate    Error
+hi def link xsSuperseded Error
+hi def link xsType       Type
+hi def link xsString     String
+hi def link xsConstant   Constant
+hi def link xsException  Exception
+hi def link xsKeyword    Keyword
+hi def link xsFunction   Function
+hi def link xsVariable   Identifier
+hi def link xsMacro      Macro
 
-delcommand HiLink
 
 let b:current_syntax = "xs"
 
diff --git a/runtime/syntax/xxd.vim b/runtime/syntax/xxd.vim
--- a/runtime/syntax/xxd.vim
+++ b/runtime/syntax/xxd.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:		bin using xxd
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		8
+" Last Change:	Aug 31, 2016
+" Version:		10
 " Notes:		use :help xxd   to see how to invoke it
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XXD
 
@@ -17,14 +17,13 @@ syn match xxdAscii				"  .\{,16\}\r\=$"h
 syn match xxdDot	contained	"[.\r]"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_xxd_syntax_inits")
 
-HiLink xxdAddress	Constant
-HiLink xxdSep		Identifier
-HiLink xxdAscii	Statement
+ hi def link xxdAddress	Constant
+ hi def link xxdSep		Identifier
+ hi def link xxdAscii	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "xxd"
 
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Yacc
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 02, 2015
-" Version:	13
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	15
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_YACC
 "
 " Options: {{{1
 "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -87,7 +87,7 @@ syn sync fromstart
 
 " ---------------------------------------------------------------------
 " Define the default highlighting. {{{1
-if !exists("did_yacc_syn_inits")
+if !exists("skip_yacc_syn_inits")
   hi def link yaccBrkt	yaccStmt
   hi def link yaccComment	Comment
   hi def link yaccCurly	Delimiter
diff --git a/runtime/syntax/z8a.vim b/runtime/syntax/z8a.vim
--- a/runtime/syntax/z8a.vim
+++ b/runtime/syntax/z8a.vim
@@ -83,21 +83,19 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink z8aSection		Special
-HiLink z8aLabel		Label
-HiLink z8aSpecialLabel	Label
-HiLink z8aComment		Comment
-HiLink z8aInstruction	Statement
-HiLink z8aSpecInst		Statement
-HiLink z8aInclude		Include
-HiLink z8aPreCondit		PreCondit
-HiLink z8aPreProc		PreProc
-HiLink z8aNumber		Number
-HiLink z8aString		String
+hi def link z8aSection		Special
+hi def link z8aLabel		Label
+hi def link z8aSpecialLabel	Label
+hi def link z8aComment		Comment
+hi def link z8aInstruction	Statement
+hi def link z8aSpecInst		Statement
+hi def link z8aInclude		Include
+hi def link z8aPreCondit		PreCondit
+hi def link z8aPreProc		PreProc
+hi def link z8aNumber		Number
+hi def link z8aString		String
 
-delcommand HiLink
 
 let b:current_syntax = "z8a"
 " vim: ts=8
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -5,7 +5,7 @@
      Vim �ϡ����Υ��塼�ȥꥢ�����������ˤ�¿���������Υ��ޥ�ɤ����������
      �˶��Ϥʥ��ǥ������Ǥ������Υ��塼�ȥꥢ��ϡ����ʤ��� Vim ����ǽ���ǥ�
      �����Ȥ��ƻȤ����ʤ���褦�ˤʤ�Τ˽�ʬ�ʥ��ޥ�ɤˤĤ��������򤹤�褦
-     �ʤäƤ��ޤ���
+     �ˤʤäƤ��ޤ���
 
      ���塼�ȥꥢ���λ����Τ�ɬ�פʻ��֤ϡ��Ф������ޥ�ɤ��Τˤɤ��
      �����֤�Ȥ��Τ��ˤ���ޤ��������褽25����30ʬ�Ǥ���
@@ -16,7 +16,7 @@
 
      ���Υ��塼�ȥꥢ�뤬���Ȥ����ȤdzФ�������ȤߤˤʤäƤ��뤳�Ȥ򡢿���
      �Ƥ����ʤ���Фʤ�ޤ����������ؽ�����ˤϥ��ޥ�ɤ�ºݤ˻�ʤ����
-     �ʤ�ʤ��ΤǤ���ʸ�Ϥ��ɤ�������ʤ�С����ä�˺��Ƥ��ޤ��ޤ�!��
+     �ʤ�ʤ��ΤǤ���ʸ�Ϥ��ɤ�������ʤ�С����ä�˺��Ƥ��ޤ��ޤ�!
 
      ������Caps���å�(Shift-Lock)������������Ƥ��ʤ����Ȥ��ǧ�����塢���̤�
      ��å���1.1 ������ɽ�������Ȥ����ޤǡ�j �����򲡤��ƥ���������ư����
@@ -242,7 +242,7 @@ NOTE: <ESC> �����򲡤��ȥΡ��ޥ�⡼�ɤ˰ܹԤ��ޤ������κݡ��ְ�ä���������
     d          - ������ޥ�ɡ�
     �⡼����� - �����Ф���Ư�������뤫(�ʲ��˵󤲤ޤ�)��
 
-  ���ڥ졼���ΰ�������:
+  �⡼���������ΰ���:
     w - ����������֤�������ޤ�ñ��������ޤǡ�
     e - ����������֤�������ޤޤʤ�ñ��������ޤǡ�
     $ - ����������֤�������ޤǡ�
@@ -706,7 +706,7 @@ NOTE: �������ޥ�ɤν��Ϥ��ɤ߹��ळ�Ȥ����ޤ����㤨�С�
   3.  v �⡼������ :w FILENAME �Ȥ���ȡ��ӥ��奢������Ԥ��ե��������¸��
       ��롣
 
-  4.  :r �ե�����̾ �ˤ��ե�����̾�Ȥ����ե����뤬�ǥ�����������ޤ졢
+  4.  :r �ե�����̾ �ˤ��ե�����̾�Ȥ����ե����뤬�ǥ������������ޤ졢
       ����������֤β�����������롣
 
   5.  :r !dir �� dir ���ޥ�ɤν��Ϥ򥫡�������ְʲ����ɤ߹��ࡣ
@@ -790,7 +790,7 @@ NOTE: �ִ��⡼�ɤ������⡼�ɤ˻��Ƥ��ޤ��������ƤΥ����פ��줿ʸ���ϴ�¸��ʸ��
 
   1. ---> �ȼ����줿�Ԥذ�ư������������� "a)" �θ���֤��Ƥ����ޤ���
   
-  2. v �ǥӥ��奢��⡼�ɤ򳫻Ϥ���"first"�μ����ޤǥ���������ư���ޤ���
+  2. v �ǥӥ��奢��⡼�ɤ򳫻Ϥ���"first" �μ����ޤǥ���������ư���ޤ���
   
   3. y �򥿥��פ��ƶ�Ĵɽ�����줿�ƥ����Ȥ� yank (���ԡ�)���ޤ���
 
@@ -969,8 +969,8 @@ NOTE: �䴰��¿���Υ��ޥ�ɤ�ư��ޤ��������� CTRL-D �� <TAB> �����ƤߤƤ���
 
   Modified for Vim by Bram Moolenaar.
 
-  ���ܸ���  ���� �ٹ�  <mattn_jp@hotmail.com>
-  �ƽ�      ¼�� ��Ϻ  <koron@tka.att.ne.jp>
+  ���ܸ���  ���� �ٹ�  <mattn.jp@gmail.com>
+  �ƽ�      ¼�� ��Ϻ  <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -5,7 +5,7 @@
      Vim �́A���̃`���[�g���A���Ő�������ɂ͑���������̃R�}���h����������
      �ɋ��͂ȃG�f�B�^�[�ł��B���̃`���[�g���A���́A���Ȃ��� Vim �𖜔\�G�f�B
      �^�[�Ƃ��Ďg�����Ȃ���悤�ɂȂ�̂ɏ\���ȃR�}���h�ɂ‚��Đ���������悤
-     �Ȃ��Ă��܂��B
+     �ɂȂ��Ă��܂��B
 
      �`���[�g���A������������̂ɕK�v�Ȏ��Ԃ́A�o�����R�}���h�������̂ɂǂꂾ
      �����Ԃ��g���̂��ɂ����܂����A���悻25����30���ł��B
@@ -16,7 +16,7 @@
 
      ���̃`���[�g���A�����A�g�����ƂŊo������d�g�݂ɂȂ��Ă��邱�Ƃ��A�S��
      �Ă����Ȃ���΂Ȃ�܂���B�������w�K����ɂ̓R�}���h�����ۂɎ����Ȃ����
-     �Ȃ�Ȃ��̂ł��B���͂�ǂ񂾂����Ȃ�΁A�����ƖY��Ă��܂��܂�!�B
+     �Ȃ�Ȃ��̂ł��B���͂�ǂ񂾂����Ȃ�΁A�����ƖY��Ă��܂��܂�!
 
      �����ACaps���b�N(Shift-Lock)�L�[��������Ă��Ȃ����Ƃ��m�F������A��ʂ�
      ���b�X��1.1 ���S���\�������Ƃ���܂ŁAj �L�[�������ăJ�[�\�����ړ�����
@@ -242,7 +242,7 @@ NOTE: <ESC> �L�[�������ƃm�[�}�����[�h�Ɉڍs���܂��B���̍ہA�Ԉ��������͓r
     d          - �폜�R�}���h�B
     ���[�V���� - ���ɑ΂��ē��������邩(�ȉ��ɋ����܂�)�B
 
-  �I�y���[�^�̈ꕔ�ꗗ:
+  ���[�V�����ꗗ�̈ꕔ:
     w - �J�[�\���ʒu����󔒂��܂ޒP��̖����܂ŁB
     e - �J�[�\���ʒu����󔒂��܂܂Ȃ��P��̖����܂ŁB
     $ - �J�[�\���ʒu����s���܂ŁB
@@ -706,7 +706,7 @@ NOTE: �O���R�}���h�̏o�͂�ǂݍ��ނ��Ƃ��o���܂��B�Ⴆ�΁A
   3.  v ���[�V������ :w FILENAME �Ƃ���ƁA�r�W���A���I���s���t�@�C���ɕۑ���
       ���B
 
-  4.  :r �t�@�C���� �ɂ��t�@�C�����Ƃ����t�@�C�����f�B�X�N���捞�܂�A
+  4.  :r �t�@�C���� �ɂ��t�@�C�����Ƃ����t�@�C�����f�B�X�N����荞�܂�A
       �J�[�\���ʒu�̉��ɑ}�������B
 
   5.  :r !dir �� dir �R�}���h�̏o�͂��J�[�\���ʒu�ȉ��ɓǂݍ��ށB
@@ -790,7 +790,7 @@ NOTE: �u�����[�h�͑}�����[�h�Ɏ��Ă��܂����A�S�Ẵ^�C�v���ꂽ�����͊����̕���
 
   1. ---> �Ǝ����ꂽ�s�ֈړ����A�J�[�\���� "a)" �̌�ɒu���Ă����܂��B
   
-  2. v �Ńr�W���A�����[�h���J�n���A"first"�̎�O�܂ŃJ�[�\�����ړ����܂��B
+  2. v �Ńr�W���A�����[�h���J�n���A"first" �̎�O�܂ŃJ�[�\�����ړ����܂��B
   
   3. y ���^�C�v���ċ����\�����ꂽ�e�L�X�g�� yank (�R�s�[)���܂��B
 
@@ -969,8 +969,8 @@ NOTE: �⊮�͑����̃R�}���h�œ��삵�܂��B������ CTRL-D �� <TAB> �����Ă݂Ă���
 
   Modified for Vim by Bram Moolenaar.
 
-  ���{���  ���{ �׍O  <mattn_jp@hotmail.com>
-  �ďC      ���� ���Y  <koron@tka.att.ne.jp>
+  ���{���  ���{ �׍O  <mattn.jp@gmail.com>
+  �ďC      ���� ���Y  <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -5,7 +5,7 @@
      Vim は、このチュートリアルで説明するには多すぎる程のコマンドを備えた非常
      に強力なエディターです。このチュートリアルは、あなたが Vim を万能エディ
      ターとして使いこなせるようになるのに十分なコマンドについて説明をするよう
-     なっています。
+     になっています。
 
      チュートリアルを完了するのに必要な時間は、覚えたコマンドを試すのにどれだ
      け時間を使うのかにもよりますが、およそ25から30分です。
@@ -16,7 +16,7 @@
 
      このチュートリアルが、使うことで覚えられる仕組みになっていることを、心し
      ておかなければなりません。正しく学習するにはコマンドを実際に試さなければ
-     ならないのです。文章を読んだだけならば、きっと忘れてしまいます!。
+     ならないのです。文章を読んだだけならば、きっと忘れてしまいます!
 
      さぁ、Capsロック(Shift-Lock)キーが押されていないことを確認した後、画面に
      レッスン1.1 が全部表示されるところまで、j キーを押してカーソルを移動しま
@@ -242,7 +242,7 @@ NOTE: <ESC> キーを押すとノーマルモードに移行します。その際、間違ったり入力途
     d          - 削除コマンド。
     モーション - 何に対して働きかけるか(以下に挙げます)。
 
-  オペレータの一部一覧:
+  モーション一覧の一部:
     w - カーソル位置から空白を含む単語の末尾まで。
     e - カーソル位置から空白を含まない単語の末尾まで。
     $ - カーソル位置から行末まで。
@@ -706,7 +706,7 @@ NOTE: 外部コマンドの出力を読み込むことも出来ます。例えば、
   3.  v モーションで :w FILENAME とすると、ビジュアル選択行がファイルに保存さ
       れる。
 
-  4.  :r ファイル名 によりファイル名というファイルがディスクより取込まれ、
+  4.  :r ファイル名 によりファイル名というファイルがディスクより取り込まれ、
       カーソル位置の下に挿入される。
 
   5.  :r !dir は dir コマンドの出力をカーソル位置以下に読み込む。
@@ -790,7 +790,7 @@ NOTE: 置換モードは挿入モードに似ていますが、全てのタイプされた文字は既存の文字
 
   1. ---> と示された行へ移動し、カーソルを "a)" の後に置いておきます。
   
-  2. v でビジュアルモードを開始し、"first"の手前までカーソルを移動します。
+  2. v でビジュアルモードを開始し、"first" の手前までカーソルを移動します。
   
   3. y をタイプして強調表示されたテキストを yank (コピー)します。
 
@@ -969,8 +969,8 @@ NOTE: 補完は多くのコマンドで動作します。そして CTRL-D と <TAB> 押してみてくだ
 
   Modified for Vim by Bram Moolenaar.
 
-  日本語訳  松本 泰弘  <mattn_jp@hotmail.com>
-  監修      村岡 太郎  <koron@tka.att.ne.jp>
+  日本語訳  松本 泰弘  <mattn.jp@gmail.com>
+  監修      村岡 太郎  <koron.kaoriya@gmail.com>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  vi:set ts=8 sts=4 sw=4 tw=78:
diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@ msgstr "E82: �Хåե���1�Ĥ�����Ǥ��ʤ��Τ�, ��λ���ޤ�..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �Хåե�������Ǥ��ʤ��Τ�, ¾�Τ���Ѥ��ޤ�..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: �Хåե�����Ͽ�Ǥ��ޤ���"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: �������줿�Хåե��Ϥ���ޤ���"
 
@@ -202,17 +205,55 @@ msgstr "%s ������:"
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    ��=%ld  ���̻�=%d  ̾��=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: �������ͥ뤬������Ǥ�"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2��Υ�ȥ饤�򤷤Ƥ�ݡ��Ȥ���³�Ǥ��ޤ���"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: �ݡ��Ȥ���³�Ǥ��ޤ���"
 
-msgid "E896: read from channel"
-msgstr "E896: �����ͥ뤫���ɤ߹���"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() ��� gethostbyname() �����Ԥ��ޤ���"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() ��� socket() �����Ԥ��ޤ���"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: ��ʸ����ΰ����Υ��ޥ�ɤ�������ޤ���"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call �κǸ�ΰ����Ͽ����Ǥʤ���Фʤ�ޤ���"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ��3���ܤΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: ̤�ΤΥ��ޥ�ɤ�������ޤ���: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ����³���֤ǽ񤭹��ߤޤ���"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): �񤭹��ߤ˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() �˥�����Хå��ϻȤ��ޤ���"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ���� nl �����ͥ�� ch_evalexpr()/ch_sendexpr �ϻȤ��ޤ���"
+
+msgid "E906: not an open channel"
+msgstr "E906: �����Ƥ��ʤ������ͥ�Ǥ�"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io �ե������ _name �����꤬ɬ�פǤ�"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io �Хåե��� in_buf �� in_name �����꤬ɬ�פǤ�"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: �Хåե��������ɤ���Ƥʤ���Фʤ�ޤ���: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: �ե����뤬̤�Τ���ˡ�ǰŹ沽����Ƥ��ޤ�"
@@ -233,7 +274,30 @@ msgid "[crypted]"
 msgstr "[�Ź沽]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
+
+msgid "extend() argument"
+msgstr "extend() ���"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld �ʾ�ΥХåե���diff�Ǥ��ޤ���"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@ msgstr "%d ���ܤγ��� (������ %d ����)"
 msgid "match %d"
 msgstr "%d ���ܤγ���"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ������ʸ���� :let �ˤ���ޤ���"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ̤������ѿ��Ǥ�: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' �����Ĥ���ޤ���"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
-
-msgid "E714: List required"
-msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
-
-msgid "E715: Dictionary required"
-msgstr "E715: ���񷿤�ɬ�פǤ�"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
-
-msgid "E718: Funcref required"
-msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] �򼭽񷿤��Ȥ߹�碌�ƤϻȤ��ޤ���"
 
@@ -443,10 +472,6 @@ msgid "E734: Wrong variable type for %s=
 msgstr "E734: �ۤʤä������ѿ��Ǥ� %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �������ѿ�̾�Ǥ�: %s"
 
@@ -486,10 +511,6 @@ msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for �θ�� \"in\" ������ޤ���"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ���å� '(' ������ޤ���: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �����ѿ��Ϥ���ޤ���: \"%s\""
 
@@ -511,9 +532,6 @@ msgstr "E735: ���񷿤ϼ��񷿤Ȥ�����ӤǤ��ޤ���"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: ���񷿤ˤ�̵�������Ǥ�"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: �ؿ����ȷ��ϴؿ����ȷ��Ȥ�����ӤǤ��ޤ���"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: �ؿ����ȷ��ˤ�̵�������Ǥ�"
 
@@ -526,6 +544,9 @@ msgstr "E110: ')' �����Ĥ���ޤ���"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: �ؿ����ȷ��ϥ���ǥå����Ǥ��ޤ���"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: �ü��ѿ��ϥ���ǥå����Ǥ��ޤ���"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ���ץ����̾������ޤ���: %s"
@@ -542,60 +563,116 @@ msgstr "E114: ������ (\") ������ޤ���: %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: ������ (') ������ޤ���: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "�����٥å����쥯��������ߤ��ޤ���! ���Ȥ��������Τ˥��꤬��­���ޤ���"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ������ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: ��ư������������ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: �ؿ����ȷ�����ͤȤ��ư��äƤ��ޤ���"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ����֤���ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: �����ͥ����ͤȤ��ư��äƤ��ޤ���"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: �ؿ����ȷ�����ư���������Ȥ��ư��äƤ��ޤ���"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: ʸ�������ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: �ꥹ�ȷ�����ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: ���񷿤���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: �ü��ͤ���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ����֤���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: �����ͥ����ư���������Ȥ��ư��äƤ��ޤ���"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
+
+msgid "E730: using List as a String"
+msgstr "E730: �ꥹ�ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: ���񷿤�ʸ����Ȥ��ư��äƤ��ޤ�"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: ̵�����ͤ�ʸ����Ȥ��ư��äƤ��ޤ�"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: �ѿ� %s �����Ǥ��ޤ���"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: �ؿ����ȷ��ѿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: �ѿ�̾����¸�δؿ�̾�Ⱦ��ͤ��ޤ�: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: �ͤ����å�����Ƥ��ޤ�: %s"
+
+msgid "Unknown"
+msgstr "����"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ���ͤ��ѹ��Ǥ��ޤ���"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: ���ԡ�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# �������Х��ѿ�:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t�Ǹ�˥��åȤ���������ץ�: "
+
+msgid "map() argument"
+msgstr "map() ���"
+
+msgid "filter() argument"
+msgstr "filter() ���"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
+
+msgid "E928: String required"
+msgstr "E928: ʸ����ɬ�פǤ�"
 
 msgid "E808: Number or Float required"
 msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
@@ -603,9 +680,6 @@ msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
 msgid "add() argument"
 msgstr "add() ���"
 
-msgid "E699: Too many arguments"
-msgstr "E699: ������¿�᤮�ޤ�"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
 
@@ -617,33 +691,22 @@ msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: ̵���ʥ�����Хå������Ǥ�"
-
-msgid "E999: not an open channel"
-msgstr "E999: �����Ƥ��ʤ������ͥ�Ǥ�"
-
-msgid "extend() argument"
-msgstr "extend() ���"
-
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
-
-msgid "map() argument"
-msgstr "map() ���"
-
-msgid "filter() argument"
-msgstr "filter() ���"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ��: "
+msgstr[1] "+-%s%3ld ��: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: ���񤬴��Ԥ���Ƥ��ޤ�"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() ���� 2 �����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@ msgstr "insert() ���"
 msgid "E786: Range not allowed"
 msgstr "E786: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
 
+msgid "E916: not a valid job"
+msgstr "E916: ͭ���ʥ���֤ǤϤ���ޤ���"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID �� \":match\" �Τ����ͽ�󤵤�Ƥ��ޤ�: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
 
@@ -695,6 +765,10 @@ msgstr "reverse() ���"
 msgid "E258: Unable to send to client"
 msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ̵�������Ǥ�: %s"
+
 msgid "sort() argument"
 msgstr "sort() ���"
 
@@ -710,163 +784,15 @@ msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
 msgid "(Invalid)"
 msgstr "(̵��)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: ̵���ʥ��֥ޥå��ֹ�: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: ����ե���������˥��顼��ȯ�����ޤ���"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: ��ư������������ͤȤ��ư��äƤ��ޤ�"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: �ؿ����ȷ�����ͤȤ��ư��äƤ��ޤ���"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: �ؿ����ȷ�����ư���������Ȥ��ư��äƤ��ޤ���"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: ʸ�������ư���������Ȥ��ư��äƤ��ޤ�"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: �ꥹ�ȷ�����ư���������Ȥ��ư��äƤ��ޤ�"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: ���񷿤���ư���������Ȥ��ư��äƤ��ޤ�"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
-
-msgid "E730: using List as a String"
-msgstr "E730: �ꥹ�ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: ���񷿤�ʸ����Ȥ��ư��äƤ��ޤ�"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �ѿ��η������פ��ޤ���: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: �ѿ� %s �����Ǥ��ޤ���"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: �ؿ����ȷ��ѿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �ѿ�̾����¸�δؿ�̾�Ⱦ��ͤ��ޤ�: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: �ͤ����å�����Ƥ��ޤ�: %s"
-
-msgid "Unknown"
-msgstr "����"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ���ͤ��ѹ��Ǥ��ޤ���"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ���ԡ�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤����δؿ��Ǥ�: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ������ޤ���: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �����ʰ����Ǥ�: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ������ޤ���"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s ��¹���Ǥ�"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s �����Ǥ���ޤ���"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s �� #%ld ���֤��ޤ���"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s �� %s ���֤��ޤ���"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s �μ¹Ԥ��³��Ǥ�"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: �ؿ����� :return ������ޤ���"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# �������Х��ѿ�:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "�Ť��ե�����Ϥ���ޤ���"
+msgid "E921: Invalid callback argument"
+msgstr "E921: ̵���ʥ�����Хå������Ǥ�"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@ msgid "E137: Viminfo file is not writabl
 msgstr "E137: viminfo�ե����뤬����ߤǤ��ޤ���: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: ���viminfo�ե����뤬¿�᤮�ޤ�! ��: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�ե����� %s ����¸�Ǥ��ޤ���!"
 
@@ -1098,8 +1028,8 @@ msgid "Sorry, help file \"%s\" not found
 msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" �����Ĥ���ޤ���"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+msgid "E151: No match: %s"
+msgstr "E151: �ޥå��Ϥ���ޤ���: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@ msgid "E154: Duplicate tag \"%s\" in fil
 msgstr "E154: ���� \"%s\" ���ե����� %s/%s �˽�ʣ���Ƥ��ޤ�"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤�Τ�sign���ޥ�ɤǤ�: %s"
 
@@ -1143,6 +1077,9 @@ msgstr "E159: sign���ֹ椬����ޤ���"
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵���ʥХåե�̾�Ǥ�: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ̾����̵���Хåե��ؤϥ����פǤ��ޤ���"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ̵����sign���̻ҤǤ�: %ld"
@@ -1161,6 +1098,9 @@ msgstr " (�󥵥ݡ���)"
 msgid "[Deleted]"
 msgstr "[�����]"
 
+msgid "No old files"
+msgstr "�Ť��ե�����Ϥ���ޤ���"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
 
@@ -1233,8 +1173,8 @@ msgid "Searching for \"%s\""
 msgstr "\"%s\" �򸡺���"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ����ˤϸ��Ĥ���ޤ���: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ����ˤϤ���ޤ���: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vim������ץȤμ����"
@@ -1263,6 +1203,10 @@ msgstr "�� %ld: %s ������"
 msgid "finished sourcing %s"
 msgstr "%s �μ����λ"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s �μ¹Ԥ��³��Ǥ�"
+
 msgid "modeline"
 msgstr "�⡼�ɹ�"
 
@@ -1466,6 +1410,9 @@ msgstr ""
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() ����Ǥ� :redir �ϻȤ��ޤ���"
+
 msgid "Save Redirection"
 msgstr "������쥯�Ȥ���¸���ޤ�"
 
@@ -1674,6 +1621,9 @@ msgstr "��"
 msgid "Input Line"
 msgstr "���Ϲ�"
 
+msgid "Debug Line"
+msgstr "�ǥХå���"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar �����ޥ��Ĺ��Ķ���ޤ���"
 
@@ -1919,11 +1869,6 @@ msgstr "1 ʸ��"
 msgid "%lld characters"
 msgstr "%lld ʸ��"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld ʸ��"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@ msgstr "E462: \"%s\" �������ɤ���������Ǥ��ޤ���Ǥ���"
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �ϥ�����ɤǤ��ޤ���Ǥ���"
 
-msgid "--Deleted--"
-msgstr "--�����--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <�Хåե�=%d> ����ưŪ�˺������ޤ�"
@@ -2015,6 +1957,12 @@ msgstr "autocommand: %s <�Хåե�=%d> ����ưŪ�˺������ޤ�"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���Υ��롼�פϤ���ޤ���: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: ������� augroup ��ä����Ȥ��Ƥ��ޤ�"
+
+msgid "--Deleted--"
+msgstr "--�����--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �θ��������ʸ��������ޤ���: %s"
@@ -2076,8 +2024,10 @@ msgid "E351: Cannot delete fold with cur
 msgstr "E351: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ����Ǥ��ޤ���"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
+msgstr[1] "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: �ɹ��Хåե����ɲ�"
@@ -2170,6 +2120,18 @@ msgstr "Vim ����������"
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
 
+msgid "_Cancel"
+msgstr "����󥻥�(_C)"
+
+msgid "_Save"
+msgstr "��¸(_S)"
+
+msgid "_Open"
+msgstr "����(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@ msgstr ""
 "������(&N)\n"
 "����󥻥�(&C)"
 
+msgid "Yes"
+msgstr "�Ϥ�"
+
+msgid "No"
+msgstr "������"
+
 msgid "Input _Methods"
 msgstr "����ץåȥ᥽�å�"
 
@@ -2212,18 +2180,18 @@ msgstr "��"
 msgid "Down"
 msgstr "��"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "���򸡺�"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "�ִ�"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "�����ִ�"
 
+msgid "_Close"
+msgstr "�Ĥ���(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
 
@@ -2275,17 +2243,6 @@ msgstr "�����ִ�(&A)"
 msgid "&Undo"
 msgstr "����ɥ�(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
-
 msgid "Open tab..."
 msgstr "���֥ڡ����򳫤�"
 
@@ -2303,6 +2260,17 @@ msgstr "�Ȥ��ޤ���"
 msgid "Directory\t*.nothing\n"
 msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
 
@@ -2564,6 +2532,7 @@ msgstr "%-5s: %s%*s (����ˡ: %s)"
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ���Υ���ܥ���Ф���������õ��\n"
 "       c: ���δؿ���Ƥ�Ǥ���ؿ���õ��\n"
 "       d: ���δؿ�����Ƥ�Ǥ���ؿ���õ��\n"
 "       e: ����egrep�ѥ������õ��\n"
@@ -2701,19 +2671,6 @@ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
 msgid "not allowed in the Vim sandbox"
 msgstr "����ɥܥå����Ǥϵ�����ޤ���"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
-"�Ƥ��ޤ�"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
 
@@ -2769,95 +2726,6 @@ msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ̤�Τ�longjmp����: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "������������ڤ��ؤ���"
-
-msgid "Show base class of"
-msgstr "���Υ��饹�δ����ɽ��"
-
-msgid "Show overridden member function"
-msgstr "�����С��饤�ɤ��줿���дؿ���ɽ��"
-
-msgid "Retrieve from file"
-msgstr "�ե����뤫���������"
-
-msgid "Retrieve from project"
-msgstr "�ץ��������Ȥ����������"
-
-msgid "Retrieve from all projects"
-msgstr "���ƤΥץ��������Ȥ����������"
-
-msgid "Retrieve"
-msgstr "����"
-
-msgid "Show source of"
-msgstr "���Υ�������ɽ������"
-
-msgid "Find symbol"
-msgstr "���Ĥ�������ܥ�"
-
-msgid "Browse class"
-msgstr "���饹�򻲾�"
-
-msgid "Show class in hierarchy"
-msgstr "���ؤǥ��饹��ɽ��"
-
-msgid "Show class in restricted hierarchy"
-msgstr "���ꤵ�줿���ؤǥ��饹��ɽ��"
-
-msgid "Xref refers to"
-msgstr "Xref �����"
-
-msgid "Xref referred by"
-msgstr "Xref �����Ȥ����"
-
-msgid "Xref has a"
-msgstr "Xref �����Τ�Τ��äƤ��ޤ�"
-
-msgid "Xref used by"
-msgstr "Xref �����Ѥ����"
-
-msgid "Show docu of"
-msgstr "����ʸ�Ϥ�ɽ��"
-
-msgid "Generate docu for"
-msgstr "����ʸ�Ϥ�����"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+����³�Ǥ��ޤ���. �Ķ�������å����Ƥ�������(sniffemacs �� $PATH �ˤʤ�"
-"��Фʤ�ޤ���).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: �ɹ���˥��顼��ȯ�����ޤ���. ���Ǥ��ޤ���"
-
-msgid "SNiFF+ is currently "
-msgstr "����SNiFF+ �ξ��֤ϡ�"
-
-msgid "not "
-msgstr "̤"
-
-msgid "connected"
-msgstr "��³�פǤ�"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: ̤�Τ� SNiFF+ �ꥯ�����ȤǤ�: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ �ؤ���³��Υ��顼�Ǥ�"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ ����³����Ƥ��ޤ���"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ �Хåե�������ޤ���"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: �������˥��顼��ȯ�������Τ����Ǥ��ޤ���"
-
 msgid "invalid buffer number"
 msgstr "̵���ʥХåե��ֹ�Ǥ�"
 
@@ -2944,6 +2812,14 @@ msgstr "E573: ̵���ʥ����С�ID���Ȥ��ޤ���: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
+
 msgid "Unknown option argument"
 msgstr "̤�ΤΥ��ץ��������Ǥ�"
 
@@ -2969,12 +2845,12 @@ msgstr "%d �ĤΥե����뤬�Խ��򹵤��Ƥ��ޤ�\n"
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans �Ϥ���GUI�Ǥ����ѤǤ��ޤ���\n"
 
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+
 msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
 
-msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
 msgid "Attempt to open script file again: \""
 msgstr "������ץȥե������Ƥӳ����Ƥߤޤ�: \""
 
@@ -2987,6 +2863,9 @@ msgstr "������ץȽ����Ѥ򳫤��ޤ���"
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ���顼: ���ΥС�������Vim��Cygwinü���Ǥ�ư��ޤ���\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �ٹ�: ü���ؤν��ϤǤϤ���ޤ���\n"
 
@@ -3151,6 +3030,9 @@ msgstr "-F\t\t\t�ڥ륷����⡼�ɤǵ�ư����"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tü���� <terminal> �����ꤹ��"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t�����Ϥ�ü���Ǥʤ��Ȥηٹ�򥹥��åפ���"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc������� <vimrc> ��Ȥ�"
 
@@ -3821,15 +3703,13 @@ msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) �̤Υץ�����बƱ���ե�������Խ����Ƥ��뤫�⤷��ޤ���.\n"
 "    ���ξ��ˤ�, �ѹ��򤷤Ƥ��ޤ���1�ĤΥե�������Ф��ưۤʤ�2�Ĥ�\n"
-"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
+"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������.\n"
+"    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ���Υե�������Խ����å���󤬥���å��夷��.\n"
@@ -4275,25 +4155,27 @@ msgid "%ld Cols; "
 msgstr "%ld ��; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "���� %s%ld / %ld ��; %ld / %ld ñ��; %ld / %ld �Х���"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld �Х���"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "���� %s%ld / %ld ��; %ld / %ld ñ��; %ld / %ld ʸ��; %ld / %ld �Х���"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "�� %s / %s; �� %ld of %ld; ñ�� %ld / %ld; �Х��� %ld / %ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld ʸ��; %lld / %lld �Х���"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "�� %s / %s; �� %ld of %ld; ñ�� %lld / %lld; �Х��� %lld / %lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"�� %s / %s; �� %ld / %ld; ñ�� %ld / %ld; ʸ�� %ld / %ld; �Х��� %ld of %ld"
+"�� %s / %s; �� %ld / %ld; ñ�� %lld / %lld; ʸ�� %lld / %lld; �Х��� %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@ msgid "Message"
 msgstr "������"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ��80�ǤϤʤ�����, �������ޥ�ɤ�¹ԤǤ��ޤ���"
+msgstr "'columns' �� 80 �ǤϤʤ����ᡢ�������ޥ�ɤ�¹ԤǤ��ޤ���"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
@@ -4552,6 +4434,10 @@ msgid "E244: Illegal charset name \"%s\"
 msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: �ʼ�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
 
@@ -4596,13 +4482,6 @@ msgstr "�������ƥ�����ƥ����� %s �� %s ��������Ǥ��ޤ���. ������ޤ�!"
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�������¹ԤǤ��ޤ��� "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"�������¹ԤǤ��ޤ��� "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@ msgid "Could not fix up function pointer
 msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ���٥�� %s ����\n"
 
@@ -4704,6 +4586,10 @@ msgid "Vim Warning"
 msgstr "Vim�ηٹ�"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: �ե����ޥå�ʸ����� %%%c ��¿�᤮�ޤ�"
 
@@ -4726,6 +4612,7 @@ msgstr "E376: �ե����ޥå�ʸ��������֤�̵���� %%%c ������ޤ�"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �ե����ޥå�ʸ�����̵���� %%%c ������ޤ�"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �˥ѥ����󤬻��ꤵ��Ƥ��ޤ���"
 
@@ -4735,6 +4622,15 @@ msgstr "E379: �ǥ��쥯�ȥ�̾��̵�������Ǥ�"
 msgid "E553: No more items"
 msgstr "E553: ���Ǥ��⤦����ޤ���"
 
+msgid "E924: Current window was closed"
+msgstr "E924: ���ߤΥ�����ɥ����Ĥ����ޤ���"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ���ߤ� quickfix ���ѹ�����ޤ���"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ���ߤΥ����������ꥹ�Ȥ��ѹ�����ޤ���"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@ msgstr "(%d of %d)%s%s: "
 msgid " (line deleted)"
 msgstr " (�Ԥ��������ޤ���)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s ���顼���� %d of %d; %d �ĥ��顼"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �����å��������Ǥ�"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �����å�����Ƭ�Ǥ�"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "���顼���� %d of %d; %d �ĥ��顼"
+msgid "No entries"
+msgstr "����ȥ꤬����ޤ���"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ���ץ�������ꤵ��Ƥ���Τǽ���ߤޤ���"
@@ -4986,9 +4885,6 @@ msgstr " �إ֥饤"
 msgid " Arabic"
 msgstr " ����ӥ�"
 
-msgid " (lang)"
-msgstr " (����)"
-
 msgid " (paste)"
 msgstr " (Ž���դ�)"
 
@@ -5083,8 +4979,49 @@ msgstr ""
 "# �Ǹ�� %s�����ѥ�����:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: ���ڥ�ե�����ν񼰥��顼�Ǥ�"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"�ٹ�: ñ��ꥹ�� \"%s.%s.spl\" ����� \"%s.ascii.spl\" �ϸ��Ĥ���ޤ���"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand �� SpellFileMissing ���Хåե��������ޤ���"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "�ٹ�9: %s �Ȥ����ϰϤϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+msgid "Sorry, no suggestions"
+msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "��ǰ�Ǥ���, ��������� %ld �Ĥ�������ޤ���"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" �򼡤��Ѵ�:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ���Ĥ���ޤ���: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: ���ڥ�ե����뤬�ڼ���Ƥ���褦�Ǥ�"
@@ -5107,19 +5044,6 @@ msgstr "E762: FOL, LOW �⤷���� UPP ��ʸ�����ϰϳ��Ǥ�"
 msgid "Compressing word tree..."
 msgstr "ñ��ĥ꡼�򰵽̤��Ƥ��ޤ�..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"�ٹ�: ñ��ꥹ�� \"%s.%s.spl\" ����� \"%s.ascii.spl\" �ϸ��Ĥ���ޤ���"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "���ڥ�ե����� \"%s\" ���ɹ���"
@@ -5137,8 +5061,24 @@ msgid "E770: Unsupported section in spel
 msgstr "E770: ���ڥ�ե�����˥��ݡ��Ȥ��Ƥ��ʤ���������󤬤���ޤ�"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "�ٹ�9: %s �Ȥ����ϰϤϥ��ݡ��Ȥ���Ƥ��ޤ���"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@ msgstr "ñ�� '%.*s' �� %s ���ɲä���ޤ���"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ñ���ʸ�������ڥ�ե�����Ȱۤʤ�ޤ�"
 
-msgid "Sorry, no suggestions"
-msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "��ǰ�Ǥ���, ��������� %ld �Ĥ�������ޤ���"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" �򼡤��Ѵ�:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ���Ĥ���ޤ���: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@ msgstr ""
 "\n"
 "--- ü������ ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt�򳫤��ޤ���"
+
 msgid "new shell started\n"
 msgstr "�������������ư���ޤ�\n"
 
@@ -5936,6 +5835,130 @@ msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 msgid "E440: undo line missing"
 msgstr "E440: ����ɥ��Ԥ�����ޤ���"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
+
+msgid "E718: Funcref required"
+msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: �����ʰ����Ǥ�: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ��¹���Ǥ�"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s �����Ǥ���ޤ���"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s �� #%ld ���֤��ޤ���"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s �� %s ���֤��ޤ���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ������¿�᤮�ޤ�"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: �ؿ��Ϻ������ޤ���: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: ̤����δؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ������ޤ���: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: ���������㡼�ؿ��ϥȥåץ�٥�˵��ҤǤ��ޤ���: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ������ޤ���"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: �ؿ����� :return ������ޤ���"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: ���å� '(' ������ޤ���: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@ msgstr ""
 "\n"
 "MS-Windows 32 �ӥå� GUI ��"
 
-msgid " in Win32s mode"
-msgstr " in Win32s �⡼��"
-
 msgid " with OLE support"
 msgstr " with OLE ���ݡ���"
 
@@ -5980,27 +6000,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 �ӥå� ��"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 �ӥå� MS-DOS ��"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 �ӥå� MS-DOS ��"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@ msgstr ""
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@ msgstr "  ��2�桼���� gvimrc: \""
 msgid "3rd user gvimrc file: \""
 msgstr "  ��3�桼���� gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  �ǥե���ȥե�����: \""
+
 msgid "    system menu file: \""
 msgstr "    �����ƥ��˥塼: \""
 
@@ -6246,10 +6251,10 @@ msgid "menu  Help->Sponsor/Register  for
 msgstr "�ܺ٤ϥ�˥塼�� �إ��->���ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   �ٹ�: Windows 95/98/Me �򸡽�  "
+msgstr "�ٹ�: Windows 95/98/ME �򸡽Ф��ޤ���"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " �ܺ٤ʾ����          :help windows95<Enter> "
+msgstr "�ܺ٤ʾ����            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
@@ -6282,9 +6287,38 @@ msgstr "E446: ��������β��˥ե�����̾������ޤ���"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID �Ϥ��Ǥ�������Ǥ�: %ld"
+
 msgid "List or number required"
 msgstr "�ꥹ�Ȥ����ͤ�ɬ�פǤ�"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID �Ϥ���ޤ���: %ld"
+
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
+"�Ƥ��ޤ�"
+
 msgid "Edit with &multiple Vims"
 msgstr "ʣ����Vim���Խ����� (&M)"
 
@@ -6561,6 +6595,28 @@ msgstr "E794: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
 
+msgid "E715: Dictionary required"
+msgstr "E715: ���񷿤�ɬ�פǤ�"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
+
+msgid "E714: List required"
+msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
 
@@ -6660,6 +6716,10 @@ msgstr "E764: ���ץ���� '%s' �����ꤵ��Ƥ��ޤ���"
 msgid "E850: Invalid register name"
 msgstr "E850: ̵���ʥ쥸����̾�Ǥ�"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: �ǥ��쥯�ȥ꤬ '%s' ����ˤ���ޤ���: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "��ޤǸ��������ΤDz������ޤ�"
 
@@ -6731,11 +6791,11 @@ msgstr "������ѹ��˼��Ԥ��ޤ���"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 2 ���ǤΥ��ץ�)"
+msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 3 ���ǤΥ��ץ�)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 2)"
+msgstr "imp.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "�������顼: imp.find_module �� NULL ��ޤॿ�ץ���֤��ޤ���"
@@ -6806,9 +6866,6 @@ msgstr "̵̾�ؿ� %s ��¸�ߤ��ޤ���"
 msgid "function %s does not exist"
 msgstr "�ؿ� %s ������ޤ���"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "�ؿ��Υ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "�ؿ� %s �μ¹Ԥ˼��Ԥ��ޤ���"
@@ -6896,6 +6953,10 @@ msgid "unable to convert %s to vim dicti
 msgstr "%s vim�μ��񷿤��Ѵ��Ǥ��ޤ���"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ��vim�Υꥹ�Ȥ��Ѵ��Ǥ��ޤ���"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s ��vim�ι�¤�Τ��Ѵ��Ǥ��ޤ���"
 
diff --git a/src/po/ja.po b/src/po/ja.po
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@ msgstr "E82: バッファを1つも作成できないので, 終了します..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: バッファを登録できません"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
@@ -202,17 +205,55 @@ msgstr "%s のサイン:"
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    行=%ld  識別子=%d  名前=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: 全チャンネルが使用中です"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2回のリトライをしてもポートに接続できません"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: ポートに接続できません"
 
-msgid "E896: read from channel"
-msgstr "E896: チャンネルから読み込み"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() 内の gethostbyname() が失敗しました"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() 内の socket() が失敗しました"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: 非文字列の引数のコマンドを受信しました"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call の最後の引数は数字でなければなりません"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call の3番目の引数はリスト型でなければなりません"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: 未知のコマンドを受信しました: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): 非接続状態で書き込みました"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): 書き込みに失敗しました"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() にコールバックは使えません"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: 生や nl チャンネルに ch_evalexpr()/ch_sendexpr は使えません"
+
+msgid "E906: not an open channel"
+msgstr "E906: 開いていないチャンネルです"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ファイルは _name の設定が必要です"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io バッファは in_buf か in_name の設定が必要です"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: バッファがロードされてなければなりません: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ファイルが未知の方法で暗号化されています"
@@ -233,7 +274,30 @@ msgid "[crypted]"
 msgstr "[暗号化]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: 辞書型に重複キーがあります: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+msgid "extend() argument"
+msgstr "extend() の引数"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: キーは既に存在します: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld 以上のバッファはdiffできません"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@ msgstr "%d 番目の該当 (全該当 %d 個中)"
 msgid "match %d"
 msgstr "%d 番目の該当"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: リストのインデックスが範囲外です: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 未定義の変数です: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' が見つかりません"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s の引数はリスト型でなければなりません"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
-
-msgid "E714: List required"
-msgstr "E714: リスト型が必要です"
-
-msgid "E715: Dictionary required"
-msgstr "E715: 辞書型が必要です"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多過ぎます: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: 辞書型にキーが存在しません: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: 辞書型内にエントリが既に存在します"
-
-msgid "E718: Funcref required"
-msgstr "E718: 関数参照型が要求されます"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] を辞書型と組み合わせては使えません"
 
@@ -443,10 +472,6 @@ msgid "E734: Wrong variable type for %s=
 msgstr "E734: 異なった型の変数です %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: 未知の関数です: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
@@ -486,10 +511,6 @@ msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for の後に \"in\" がありません"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: カッコ '(' がありません: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
@@ -511,9 +532,6 @@ msgstr "E735: 辞書型は辞書型としか比較できません"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: 辞書型には無効な操作です"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: 関数参照型は関数参照型としか比較できません"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: 関数参照型には無効な操作です"
 
@@ -526,6 +544,9 @@ msgstr "E110: ')' が見つかりません"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: 関数参照型はインデックスできません"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: 特殊変数はインデックスできません"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
@@ -542,60 +563,116 @@ msgstr "E114: 引用符 (\") がありません: %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: リスト型にカンマがありません: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: リスト型の最後に ']' がありません: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: 辞書型にコロンがありません: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: 辞書型に重複キーがあります: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: 辞書型にカンマがありません: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: 辞書型の最後に '}' がありません: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 表示するには変数の入れ子が深過ぎます"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: 関数の引数が多過ぎます: %s"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数の無効な引数です: %s"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: 浮動小数点数を数値として扱っています"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: 関数参照型を数値として扱っています。"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: リスト型を数値として扱っています"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: 辞書型を数値として扱っています"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ジョブを数値として扱っています"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: チャンネルを数値として扱っています。"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: 文字列を浮動小数点数として扱っています"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: リスト型を浮動小数点数として扱っています"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: 辞書型を浮動小数点数として扱っています"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: 特殊値を浮動小数点数として扱っています"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ジョブを浮動小数点数として扱っています"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: チャンネルを浮動小数点数として扱っています。"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: 関数参照型を文字列として扱っています"
+
+msgid "E730: using List as a String"
+msgstr "E730: リスト型を文字列として扱っています"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 辞書型を文字列として扱っています"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: 無効な値を文字列として扱っています"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: 変数 %s を削除できません"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 変数名が既存の関数名と衝突します: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 値がロックされています: %s"
+
+msgid "Unknown"
+msgstr "不明"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s の値を変更できません"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# グローバル変数:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t最後にセットしたスクリプト: "
+
+msgid "map() argument"
+msgstr "map() の引数"
+
+msgid "filter() argument"
+msgstr "filter() の引数"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
+msgid "E928: String required"
+msgstr "E928: 文字列が必要です"
 
 msgid "E808: Number or Float required"
 msgstr "E808: 数値か浮動小数点数が必要です"
@@ -603,9 +680,6 @@ msgstr "E808: 数値か浮動小数点数が必要です"
 msgid "add() argument"
 msgstr "add() の引数"
 
-msgid "E699: Too many arguments"
-msgstr "E699: 引数が多過ぎます"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() は挿入モードでしか利用できません"
 
@@ -617,33 +691,22 @@ msgstr "E785: complete() は挿入モードでしか利用できません"
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: 無効なコールバック引数です"
-
-msgid "E999: not an open channel"
-msgstr "E999: 開いていないチャンネルです"
-
-msgid "extend() argument"
-msgstr "extend() の引数"
-
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: キーは既に存在します: %s"
-
-msgid "map() argument"
-msgstr "map() の引数"
-
-msgid "filter() argument"
-msgstr "filter() の引数"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 行: "
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
+msgstr[1] "+-%s%3ld 行: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 未知の関数です: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: 辞書が期待されています"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() の第 2 引数はリスト型または辞書型でなければなりません"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@ msgstr "insert() の引数"
 msgid "E786: Range not allowed"
 msgstr "E786: 範囲指定は許可されていません"
 
+msgid "E916: not a valid job"
+msgstr "E916: 有効なジョブではありません"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() には無効な型です"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID は \":match\" のために予約されています: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: ストライド(前進量)が 0 です"
 
@@ -695,6 +765,10 @@ msgstr "reverse() の引数"
 msgid "E258: Unable to send to client"
 msgstr "E258: クライアントへ送ることができません"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 無効な操作です: %s"
+
 msgid "sort() argument"
 msgstr "sort() の引数"
 
@@ -710,163 +784,15 @@ msgstr "E882: Uniq の比較関数が失敗しました"
 msgid "(Invalid)"
 msgstr "(無効)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: 無効なサブマッチ番号: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: 一時ファイル書込中にエラーが発生しました"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: 浮動小数点数を数値として扱っています"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: 関数参照型を数値として扱っています。"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: リスト型を数値として扱っています"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: 辞書型を数値として扱っています"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: 文字列を浮動小数点数として扱っています"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: リスト型を浮動小数点数として扱っています"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: 辞書型を浮動小数点数として扱っています"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: 関数参照型を文字列として扱っています"
-
-msgid "E730: using List as a String"
-msgstr "E730: リスト型を文字列として扱っています"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: 辞書型を文字列として扱っています"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: 変数の型が一致しません: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: 変数 %s を削除できません"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: 変数名が既存の関数名と衝突します: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: 値がロックされています: %s"
-
-msgid "Unknown"
-msgstr "不明"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s の値を変更できません"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' がありません: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: ここでは g: は使えません"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: 不正な引数です: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: 引数名が重複しています: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction がありません"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: 関数名が変数名と衝突します: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: 関数名が要求されます"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: 関数名にはコロンは含められません: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 関数 %s を削除できません: 使用中です"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s を実行中です"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s が中断されました"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s が #%ld を返しました"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s が %s を返しました"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s の実行を継続中です"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: 関数外に :return がありました"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# グローバル変数:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "古いファイルはありません"
+msgid "E921: Invalid callback argument"
+msgstr "E921: 無効なコールバック引数です"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@ msgid "E137: Viminfo file is not writabl
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: 一時viminfoファイルが多過ぎます! 例: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoファイル %s を保存できません!"
 
@@ -1098,8 +1028,8 @@ msgid "Sorry, help file \"%s\" not found
 msgstr "残念ですがヘルプファイル \"%s\" が見つかりません"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ディレクトリではありません: %s"
+msgid "E151: No match: %s"
+msgstr "E151: マッチはありません: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@ msgid "E154: Duplicate tag \"%s\" in fil
 msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ディレクトリではありません: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
@@ -1143,6 +1077,9 @@ msgstr "E159: signの番号がありません"
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 名前の無いバッファへはジャンプできません"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: 無効なsign識別子です: %ld"
@@ -1161,6 +1098,9 @@ msgstr " (非サポート)"
 msgid "[Deleted]"
 msgstr "[削除済]"
 
+msgid "No old files"
+msgstr "古いファイルはありません"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
@@ -1233,8 +1173,8 @@ msgid "Searching for \"%s\""
 msgstr "\"%s\" を検索中"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' の中には見つかりません: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' の中にはありません: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vimスクリプトの取込み"
@@ -1263,6 +1203,10 @@ msgstr "行 %ld: %s を取込中"
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s の実行を継続中です"
+
 msgid "modeline"
 msgstr "モード行"
 
@@ -1466,6 +1410,9 @@ msgstr ""
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos には2つの数値の引数が必要です"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() の中では :redir は使えません"
+
 msgid "Save Redirection"
 msgstr "リダイレクトを保存します"
 
@@ -1674,6 +1621,9 @@ msgstr "式"
 msgid "Input Line"
 msgstr "入力行"
 
+msgid "Debug Line"
+msgstr "デバッグ行"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar がコマンド長を超えました"
 
@@ -1919,11 +1869,6 @@ msgstr "1 文字"
 msgid "%lld characters"
 msgstr "%lld 文字"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld 文字"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@ msgstr "E462: \"%s\" をリロードする準備ができませんでした"
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-msgid "--Deleted--"
-msgstr "--削除済--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
@@ -2015,6 +1957,12 @@ msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: そのグループはありません: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 使用中の augroup を消そうとしています"
+
+msgid "--Deleted--"
+msgstr "--削除済--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * の後に不正な文字がありました: %s"
@@ -2076,8 +2024,10 @@ msgid "E351: Cannot delete fold with cur
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld 行が折畳まれました "
+msgstr[1] "+--%3ld 行が折畳まれました "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
@@ -2170,6 +2120,18 @@ msgstr "Vim ダイアログ"
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
 
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+msgid "_Save"
+msgstr "保存(_S)"
+
+msgid "_Open"
+msgstr "開く(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@ msgstr ""
 "いいえ(&N)\n"
 "キャンセル(&C)"
 
+msgid "Yes"
+msgstr "はい"
+
+msgid "No"
+msgstr "いいえ"
+
 msgid "Input _Methods"
 msgstr "インプットメソッド"
 
@@ -2212,18 +2180,18 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "次を検索"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "置換"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "全て置換"
 
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
 
@@ -2275,17 +2243,6 @@ msgstr "全て置換(&A)"
 msgid "&Undo"
 msgstr "アンドゥ(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDIアプリの中ではウィンドウを開けません"
-
 msgid "Open tab..."
 msgstr "タブページを開く"
 
@@ -2303,6 +2260,17 @@ msgstr "使われません"
 msgid "Directory\t*.nothing\n"
 msgstr "ディレクトリ\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIアプリの中ではウィンドウを開けません"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
 
@@ -2564,6 +2532,7 @@ msgstr "%-5s: %s%*s (使用法: %s)"
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: このシンボルに対する代入を探す\n"
 "       c: この関数を呼んでいる関数を探す\n"
 "       d: この関数から呼んでいる関数を探す\n"
 "       e: このegrepパターンを探す\n"
@@ -2701,19 +2671,6 @@ msgstr "範囲外の行番号です"
 msgid "not allowed in the Vim sandbox"
 msgstr "サンドボックスでは許されません"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ライブラリ %s をロードできませんでした"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
-"ています"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
 
@@ -2769,95 +2726,6 @@ msgstr "E272: 取り扱われなかった例外があります"
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: 未知のlongjmp状態: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "実装と定義を切り替える"
-
-msgid "Show base class of"
-msgstr "次のクラスの基底を表示"
-
-msgid "Show overridden member function"
-msgstr "オーバーライドされたメンバ関数を表示"
-
-msgid "Retrieve from file"
-msgstr "ファイルから回復する"
-
-msgid "Retrieve from project"
-msgstr "プロジェクトから回復する"
-
-msgid "Retrieve from all projects"
-msgstr "全てのプロジェクトから回復する"
-
-msgid "Retrieve"
-msgstr "回復"
-
-msgid "Show source of"
-msgstr "次のソースを表示する"
-
-msgid "Find symbol"
-msgstr "見つけたシンボル"
-
-msgid "Browse class"
-msgstr "クラスを参照"
-
-msgid "Show class in hierarchy"
-msgstr "階層でクラスを表示"
-
-msgid "Show class in restricted hierarchy"
-msgstr "限定された階層でクラスを表示"
-
-msgid "Xref refers to"
-msgstr "Xref の参照先"
-
-msgid "Xref referred by"
-msgstr "Xref が参照される"
-
-msgid "Xref has a"
-msgstr "Xref が次のものをもっています"
-
-msgid "Xref used by"
-msgstr "Xref が使用される"
-
-msgid "Show docu of"
-msgstr "次の文章を表示"
-
-msgid "Generate docu for"
-msgstr "次の文章を生成"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+に接続できません. 環境をチェックしてください(sniffemacs が $PATH になけ"
-"ればなりません).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: 読込中にエラーが発生しました. 切断しました"
-
-msgid "SNiFF+ is currently "
-msgstr "現在SNiFF+ の状態は「"
-
-msgid "not "
-msgstr "未"
-
-msgid "connected"
-msgstr "接続」です"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: 未知の SNiFF+ リクエストです: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ への接続中のエラーです"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ に接続されていません"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ バッファがありません"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: 書込み中にエラーが発生したので切断しました"
-
 msgid "invalid buffer number"
 msgstr "無効なバッファ番号です"
 
@@ -2944,6 +2812,14 @@ msgstr "E573: 無効なサーバーIDが使われました: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
+
 msgid "Unknown option argument"
 msgstr "未知のオプション引数です"
 
@@ -2969,12 +2845,12 @@ msgstr "%d 個のファイルが編集を控えています\n"
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans はこのGUIでは利用できません\n"
 
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
+
 msgid "This Vim was not compiled with the diff feature."
 msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
 
-msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
-
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
@@ -2987,6 +2863,9 @@ msgstr "スクリプト出力用を開けません"
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: エラー: このバージョンのVimはCygwin端末では動作しません\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 警告: 端末への出力ではありません\n"
 
@@ -3151,6 +3030,9 @@ msgstr "-F\t\t\tペルシア語モードで起動する"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t入出力が端末でないとの警告をスキップする"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
@@ -3821,15 +3703,13 @@ msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
 "    この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
-"    インスタンスができてしまうので, そうしないように気をつけてください."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    終了するか, 注意しながら続けてください.\n"
+"    インスタンスができてしまうので, そうしないように気をつけてください.\n"
+"    終了するか, 注意しながら続けてください.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
@@ -4275,25 +4155,27 @@ msgid "%ld Cols; "
 msgstr "%ld 列; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld バイト"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld バイト"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld 文字; %ld / %ld バイト"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "列 %s / %s; 行 %ld of %ld; 単語 %ld / %ld; バイト %ld / %ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld 文字; %lld / %lld バイト"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "列 %s / %s; 行 %ld of %ld; 単語 %lld / %lld; バイト %lld / %lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"列 %s / %s; 行 %ld / %ld; 単語 %ld / %ld; 文字 %ld / %ld; バイト %ld of %ld"
+"列 %s / %s; 行 %ld / %ld; 単語 %lld / %lld; 文字 %lld / %lld; バイト %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@ msgid "Message"
 msgstr "メッセージ"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
+msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: プリンタの選択に失敗しました"
@@ -4552,6 +4434,10 @@ msgid "E244: Illegal charset name \"%s\"
 msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: 品質名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
 
@@ -4596,13 +4482,6 @@ msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"シェルを実行できません "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"シェルを実行できません "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@ msgid "Could not fix up function pointer
 msgstr "DLLから関数ポインタを取得できませんでした"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "シェルがコード %d で終了しました"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: イベント %s を検知\n"
 
@@ -4704,6 +4586,10 @@ msgid "Vim Warning"
 msgstr "Vimの警告"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "シェルがコード %d で終了しました"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
 
@@ -4726,6 +4612,7 @@ msgstr "E376: フォーマット文字列の前置に無効な %%%c があります"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: フォーマット文字列に無効な %%%c があります"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' にパターンが指定されていません"
 
@@ -4735,6 +4622,15 @@ msgstr "E379: ディレクトリ名が無いか空です"
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
+msgid "E924: Current window was closed"
+msgstr "E924: 現在のウィンドウが閉じられました"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: 現在の quickfix が変更されました"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: 現在のロケーションリストが変更されました"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@ msgstr "(%d of %d)%s%s: "
 msgid " (line deleted)"
 msgstr " (行が削除されました)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s エラー一覧 %d of %d; %d 個エラー"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix スタックの末尾です"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix スタックの先頭です"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "エラー一覧 %d of %d; %d 個エラー"
+msgid "No entries"
+msgstr "エントリがありません"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込みません"
@@ -4986,9 +4885,6 @@ msgstr " ヘブライ"
 msgid " Arabic"
 msgstr " アラビア"
 
-msgid " (lang)"
-msgstr " (言語)"
-
 msgid " (paste)"
 msgstr " (貼り付け)"
 
@@ -5083,8 +4979,49 @@ msgstr ""
 "# 最後の %s検索パターン:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: スペルファイルの書式エラーです"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: スペルチェックは無効化されています"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand の SpellFileMissing がバッファを削除しました"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "警告9: %s という範囲はサポートされていません"
+
+msgid "Sorry, no suggestions"
+msgstr "残念ですが, 修正候補はありません"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "残念ですが, 修正候補は %ld 個しかありません"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" を次へ変換:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: スペル置換がまだ実行されていません"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 見つかりません: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: スペルファイルが切取られているようです"
@@ -5107,19 +5044,6 @@ msgstr "E762: FOL, LOW もしくは UPP の文字が範囲外です"
 msgid "Compressing word tree..."
 msgstr "単語ツリーを圧縮しています..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: スペルチェックは無効化されています"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "スペルファイル \"%s\" を読込中"
@@ -5137,8 +5061,24 @@ msgid "E770: Unsupported section in spel
 msgstr "E770: スペルファイルにサポートしていないセクションがあります"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "警告9: %s という範囲はサポートされていません"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ファイルではないようです: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@ msgstr "単語 '%.*s' が %s へ追加されました"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 単語の文字がスペルファイルと異なります"
 
-msgid "Sorry, no suggestions"
-msgstr "残念ですが, 修正候補はありません"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "残念ですが, 修正候補は %ld 個しかありません"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" を次へ変換:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: スペル置換がまだ実行されていません"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: 見つかりません: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ファイルではないようです: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@ msgstr ""
 "\n"
 "--- 端末キー ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txtを開けません"
+
 msgid "new shell started\n"
 msgstr "新しいシェルを起動します\n"
 
@@ -5936,6 +5835,130 @@ msgstr "E439: アンドゥリストが壊れています"
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: 不正な引数です: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: 引数名が重複しています: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: 関数の無効な引数です: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s を実行中です"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s が中断されました"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s が #%ld を返しました"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 引数が多過ぎます"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: 未知の関数です: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: 関数は削除されました: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: 関数の引数が足りません: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: 関数名が要求されます"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: 関数名にはコロンは含められません: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: 未定義の関数です: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' がありません: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ここでは g: は使えません"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: クロージャー関数はトップレベルに記述できません: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction がありません"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: 関数名が変数名と衝突します: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: 関数 %s を再定義できません: 使用中です"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: 関数 %s を削除できません: 使用中です"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: 関数外に :return がありました"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: カッコ '(' がありません: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@ msgstr ""
 "\n"
 "MS-Windows 32 ビット GUI 版"
 
-msgid " in Win32s mode"
-msgstr " in Win32s モード"
-
 msgid " with OLE support"
 msgstr " with OLE サポート"
 
@@ -5980,27 +6000,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 ビット 版"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 ビット MS-DOS 版"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 ビット MS-DOS 版"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@ msgstr ""
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@ msgstr "  第2ユーザー gvimrc: \""
 msgid "3rd user gvimrc file: \""
 msgstr "  第3ユーザー gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  デフォルトファイル: \""
+
 msgid "    system menu file: \""
 msgstr "    システムメニュー: \""
 
@@ -6246,10 +6251,10 @@ msgid "menu  Help->Sponsor/Register  for
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   警告: Windows 95/98/Me を検出  "
+msgstr "警告: Windows 95/98/ME を検出しました"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " 詳細な情報は          :help windows95<Enter> "
+msgstr "詳細な情報は            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
@@ -6282,9 +6287,38 @@ msgstr "E446: カーソルの下にファイル名がありません"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: pathには \"%s\" というファイルがありません"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %ld (1 以上でなければなりません)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID はすでに利用中です: %ld"
+
 msgid "List or number required"
 msgstr "リストか数値が必要です"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID はありません: %ld"
+
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
+"ています"
+
 msgid "Edit with &multiple Vims"
 msgstr "複数のVimで編集する (&M)"
 
@@ -6561,6 +6595,28 @@ msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: 辞書型に空のキーを使うことはできません"
 
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
+
+msgid "E714: List required"
+msgstr "E714: リスト型が必要です"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
@@ -6660,6 +6716,10 @@ msgstr "E764: オプション '%s' は設定されていません"
 msgid "E850: Invalid register name"
 msgstr "E850: 無効なレジスタ名です"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "上まで検索したので下に戻ります"
 
@@ -6731,11 +6791,11 @@ msgstr "辞書の変更に失敗しました"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() が %s を返しました (期待値: 2 要素のタプル)"
+msgstr "imp.find_module() が %s を返しました (期待値: 3 要素のタプル)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() が %d 要素のタプルを返しました (期待値: 2)"
+msgstr "imp.find_module() が %d 要素のタプルを返しました (期待値: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
@@ -6806,9 +6866,6 @@ msgstr "無名関数 %s は存在しません"
 msgid "function %s does not exist"
 msgstr "関数 %s がありません"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "関数のコンストラクタはキーワード引数を受け付けません"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "関数 %s の実行に失敗しました"
@@ -6896,6 +6953,10 @@ msgid "unable to convert %s to vim dicti
 msgstr "%s vimの辞書型に変換できません"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s をvimのリストに変換できません"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s をvimの構造体に変換できません"
 
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01-09:08+0900\n"
+"POT-Creation-Date: 2016-08-31 18:10+0900\n"
+"PO-Revision-Date: 2016-08-31 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -53,6 +53,9 @@ msgstr "E82: �o�b�t�@��1�‚��쐬�ł��Ȃ��̂�, �I�����܂�..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �o�b�t�@���쐬�ł��Ȃ��̂�, ���̂��g�p���܂�..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: �o�b�t�@��o�^�ł��܂���"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ������ꂽ�o�b�t�@�͂���܂���"
 
@@ -202,17 +205,55 @@ msgstr "%s �̃T�C��:"
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    �s=%ld  ���ʎq=%d  ���O=%s"
 
-msgid "E897: All channels are in use"
-msgstr "E897: �S�`�����l�����g�p���ł�"
-
-msgid "E899: Cannot connect to port after retry2"
-msgstr "E899: 2��̃��g���C�����Ă��|�[�g�ɐڑ��ł��܂���"
-
 msgid "E902: Cannot connect to port"
 msgstr "E902: �|�[�g�ɐڑ��ł��܂���"
 
-msgid "E896: read from channel"
-msgstr "E896: �`�����l������ǂݍ���"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() ���� gethostbyname() �����s���܂���"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() ���� socket() �����s���܂���"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: �񕶎���̈����̃R�}���h����M���܂���"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call �̍Ō�̈����͐����łȂ���΂Ȃ�܂���"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ��3�Ԗڂ̈����̓��X�g�^�łȂ���΂Ȃ�܂���"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: ���m�̃R�}���h����M���܂���: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ��ڑ���Ԃŏ������݂܂���"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): �������݂Ɏ��s���܂���"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() �ɃR�[���o�b�N�͎g���܂���"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ���� nl �`�����l���� ch_evalexpr()/ch_sendexpr �͎g���܂���"
+
+msgid "E906: not an open channel"
+msgstr "E906: �J���Ă��Ȃ��`�����l���ł�"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io �t�@�C���� _name �̐ݒ肪�K�v�ł�"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io �o�b�t�@�� in_buf �� in_name �̐ݒ肪�K�v�ł�"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: �o�b�t�@�����[�h����ĂȂ���΂Ȃ�܂���: %s"
 
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: �t�@�C�������m�̕��@�ňÍ�������Ă��܂�"
@@ -233,7 +274,30 @@ msgid "[crypted]"
 msgstr "[����]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: �����^�ɃR����������܂���: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: �����^�ɏd���L�[������܂�: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: �����^�ɃJ���}������܂���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: �����^�̍Ō�� '}' ������܂���: %s"
+
+msgid "extend() argument"
+msgstr "extend() �̈���"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: �L�[�͊��ɑ��݂��܂�: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: %ld �ȏ�̃o�b�t�@��diff�ł��܂���"
 
 msgid "E810: Cannot read or write temp files"
@@ -389,52 +453,17 @@ msgstr "%d �Ԗڂ̊Y�� (�S�Y�� %d �’�)"
 msgid "match %d"
 msgstr "%d �Ԗڂ̊Y��"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: �\\�����ʕ����� :let �ɂ���܂���"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: ���X�g�̃C���f�b�N�X���͈͊O�ł�: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ����`�̕ϐ��ł�: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' �����‚���܂���"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �̈����̓��X�g�^�łȂ���΂Ȃ�܂���"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �̈����̓��X�g�^�܂��͎����^�łȂ���΂Ȃ�܂���"
-
-msgid "E714: List required"
-msgstr "E714: ���X�g�^���K�v�ł�"
-
-msgid "E715: Dictionary required"
-msgstr "E715: �����^���K�v�ł�"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �֐��̈��������߂��܂�: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: �����^�ɃL�[�����݂��܂���: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �֐� %s �͒�`�ςł�, �Ē�`����ɂ� ! ��lj����Ă�������"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: �����^���ɃG���g�������ɑ��݂��܂�"
-
-msgid "E718: Funcref required"
-msgstr "E718: �֐��Q�ƌ^���v������܂�"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] �������^�Ƒg�ݍ��킹�Ă͎g���܂���"
 
@@ -443,10 +472,6 @@ msgid "E734: Wrong variable type for %s=
 msgstr "E734: �قȂ����^�̕ϐ��ł� %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ���m�̊֐��ł�: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �s���ȕϐ����ł�: %s"
 
@@ -486,10 +511,6 @@ msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for �̌�� \"in\" ������܂���"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: �J�b�R '(' ������܂���: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ���̕ϐ��͂���܂���: \"%s\""
 
@@ -511,9 +532,6 @@ msgstr "E735: �����^�͎����^�Ƃ�����r�ł��܂���"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: �����^�ɂ͖����ȑ���ł�"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: �֐��Q�ƌ^�͊֐��Q�ƌ^�Ƃ�����r�ł��܂���"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: �֐��Q�ƌ^�ɂ͖����ȑ���ł�"
 
@@ -526,6 +544,9 @@ msgstr "E110: ')' �����‚���܂���"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: �֐��Q�ƌ^�̓C���f�b�N�X�ł��܂���"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: ����ϐ��̓C���f�b�N�X�ł��܂���"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: �I�v�V������������܂���: %s"
@@ -542,60 +563,116 @@ msgstr "E114: ���p�� (\") ������܂���: %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: ���p�� (') ������܂���: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ���X�g�^�ɃJ���}������܂���: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ���X�g�^�̍Ō�� ']' ������܂���: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "�K�[�x�b�W�R���N�V�����𒆎~���܂���! �Q�Ƃ��쐬����̂Ƀ��������s�����܂���"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: �����^�ɃR����������܂���: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: �����^�ɏd���L�[������܂�: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: �����^�ɃJ���}������܂���: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: �����^�̍Ō�� '}' ������܂���: %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: �\\������ɂ͕ϐ��̓���q���[�߂��܂�"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �֐��̈��������߂��܂�: %s"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �֐��̖����Ȉ����ł�: %s"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ���m�̊֐��ł�: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �֐��̈���������܂���: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: �X�N���v�g�ȊO��<SID>���g���܂���: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: �����p�֐����Ă΂�܂���������������܂���: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: ���������_���𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: �֐��Q�ƌ^�𐔒l�Ƃ��Ĉ����Ă��܂��B"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: ���X�g�^�𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: �����^�𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: �W���u�𐔒l�Ƃ��Ĉ����Ă��܂�"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: �`�����l���𐔒l�Ƃ��Ĉ����Ă��܂��B"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: �֐��Q�ƌ^�𕂓������_���Ƃ��Ĉ����Ă��܂��B"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: ������𕂓������_���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: ���X�g�^�𕂓������_���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: �����^�𕂓������_���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: ����l�𕂓������_���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: �W���u�𕂓������_���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: �`�����l���𕂓������_���Ƃ��Ĉ����Ă��܂��B"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: �֐��Q�ƌ^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E730: using List as a String"
+msgstr "E730: ���X�g�^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �����^�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: �����Ȓl�𕶎���Ƃ��Ĉ����Ă��܂�"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: �ϐ� %s ���폜�ł��܂���"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: �֐��Q�ƌ^�ϐ����͑啶���Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: �ϐ����������̊֐����ƏՓ˂��܂�: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: �l�����b�N����Ă��܂�: %s"
+
+msgid "Unknown"
+msgstr "�s��"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s �̒l��ύX�ł��܂���"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: �R�s�[�����ɂ͕ϐ��̓���q���[�߂��܂�"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# �O���[�o���ϐ�:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t�Ō�ɃZ�b�g�����X�N���v�g: "
+
+msgid "map() argument"
+msgstr "map() �̈���"
+
+msgid "filter() argument"
+msgstr "filter() �̈���"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �̈����̓��X�g�^�łȂ���΂Ȃ�܂���"
+
+msgid "E928: String required"
+msgstr "E928: �����񂪕K�v�ł�"
 
 msgid "E808: Number or Float required"
 msgstr "E808: ���l�����������_�����K�v�ł�"
@@ -603,9 +680,6 @@ msgstr "E808: ���l�����������_�����K�v�ł�"
 msgid "add() argument"
 msgstr "add() �̈���"
 
-msgid "E699: Too many arguments"
-msgstr "E699: ���������߂��܂�"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() �͑}�����[�h�ł������p�ł��܂���"
 
@@ -617,33 +691,22 @@ msgstr "E785: complete() �͑}�����[�h�ł������p�ł��܂���"
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "E999: Invalid callback argument"
-msgstr "E999: �����ȃR�[���o�b�N�����ł�"
-
-msgid "E999: not an open channel"
-msgstr "E999: �J���Ă��Ȃ��`�����l���ł�"
-
-msgid "extend() argument"
-msgstr "extend() �̈���"
-
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: �L�[�͊��ɑ��݂��܂�: %s"
-
-msgid "map() argument"
-msgstr "map() �̈���"
-
-msgid "filter() argument"
-msgstr "filter() �̈���"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld �s: "
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld �s: "
+msgstr[1] "+-%s%3ld �s: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: ���m�̊֐��ł�: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: ���������҂���Ă��܂�"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() �̑� 2 �����̓��X�g�^�܂��͎����^�łȂ���΂Ȃ�܂���"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -660,9 +723,16 @@ msgstr "insert() �̈���"
 msgid "E786: Range not allowed"
 msgstr "E786: �͈͎w��͋��‚���Ă��܂���"
 
+msgid "E916: not a valid job"
+msgstr "E916: �L���ȃW���u�ł͂���܂���"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() �ɂ͖����Ȍ^�ł�"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID �� \":match\" �̂��߂ɗ\\�񂳂�Ă��܂�: %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: �X�g���C�h(�O�i��)�� 0 �ł�"
 
@@ -695,6 +765,10 @@ msgstr "reverse() �̈���"
 msgid "E258: Unable to send to client"
 msgstr "E258: �N���C�A���g�֑��邱�Ƃ��ł��܂���"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: �����ȑ���ł�: %s"
+
 msgid "sort() argument"
 msgstr "sort() �̈���"
 
@@ -710,163 +784,15 @@ msgstr "E882: Uniq �̔�r�֐������s���܂���"
 msgid "(Invalid)"
 msgstr "(����)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: �����ȃT�u�}�b�`�ԍ�: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: �ꎞ�t�@�C���������ɃG���[���������܂���"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: ���������_���𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: �֐��Q�ƌ^�𐔒l�Ƃ��Ĉ����Ă��܂��B"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: ���X�g�^�𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: �����^�𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: �֐��Q�ƌ^�𕂓������_���Ƃ��Ĉ����Ă��܂��B"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: ������𕂓������_���Ƃ��Ĉ����Ă��܂�"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: ���X�g�^�𕂓������_���Ƃ��Ĉ����Ă��܂�"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: �����^�𕂓������_���Ƃ��Ĉ����Ă��܂�"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: �֐��Q�ƌ^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-msgid "E730: using List as a String"
-msgstr "E730: ���X�g�^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: �����^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �ϐ��̌^����v���܂���: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: �ϐ� %s ���폜�ł��܂���"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: �֐��Q�ƌ^�ϐ����͑啶���Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �ϐ����������̊֐����ƏՓ˂��܂�: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: �l�����b�N����Ă��܂�: %s"
-
-msgid "Unknown"
-msgstr "�s��"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s �̒l��ύX�ł��܂���"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: �R�s�[�����ɂ͕ϐ��̓���q���[�߂��܂�"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ����`�̊֐��ł�: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ������܂���: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: �����ł� g: �͎g���܂���"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �s���Ȉ����ł�: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ���������d�����Ă��܂�: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ������܂���"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �֐������ϐ����ƏՓ˂��܂�: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �֐� %s ���Ē�`�ł��܂���: �g�p���ł�"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �֐������X�N���v�g�̃t�@�C�����ƈ�v���܂���: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: �֐������v������܂�"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �֐����͑啶���� \"s:\" �Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: �֐����ɂ̓R�����͊܂߂��܂���: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �֐� %s ���폜�ł��܂���: �g�p���ł�"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �֐��ďo�̓���q���� 'maxfuncdepth' �𒴂��܂���"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s �����s���ł�"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s �����f����܂���"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s �� #%ld ��Ԃ��܂���"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s �� %s ��Ԃ��܂���"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s �̎��s���p�����ł�"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: �֐��O�� :return ������܂���"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# �O���[�o���ϐ�:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-msgid "No old files"
-msgstr "�Â��t�@�C���͂���܂���"
+msgid "E921: Invalid callback argument"
+msgstr "E921: �����ȃR�[���o�b�N�����ł�"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -929,6 +855,10 @@ msgid "E137: Viminfo file is not writabl
 msgstr "E137: viminfo�t�@�C���������݂ł��܂���: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: �ꎞviminfo�t�@�C�������߂��܂�! ��: %s"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�t�@�C�� %s ��ۑ��ł��܂���!"
 
@@ -1098,8 +1028,8 @@ msgid "Sorry, help file \"%s\" not found
 msgstr "�c�O�ł����w���v�t�@�C�� \"%s\" �����‚���܂���"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �f�B���N�g���ł͂���܂���: %s"
+msgid "E151: No match: %s"
+msgstr "E151: �}�b�`�͂���܂���: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1119,6 +1049,10 @@ msgid "E154: Duplicate tag \"%s\" in fil
 msgstr "E154: �^�O \"%s\" ���t�@�C�� %s/%s �ɏd�����Ă��܂�"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: �f�B���N�g���ł͂���܂���: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ���m��sign�R�}���h�ł�: %s"
 
@@ -1143,6 +1077,9 @@ msgstr "E159: sign�̔ԍ�������܂���"
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: �����ȃo�b�t�@���ł�: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ���O�̖����o�b�t�@�ւ̓W�����v�ł��܂���"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ������sign���ʎq�ł�: %ld"
@@ -1161,6 +1098,9 @@ msgstr " (��T�|�[�g)"
 msgid "[Deleted]"
 msgstr "[�폜��]"
 
+msgid "No old files"
+msgstr "�Â��t�@�C���͂���܂���"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�f�o�b�O���[�h�ɓ���܂�. ������ɂ� \"cont\" �Ɠ��͂��Ă�������."
 
@@ -1233,8 +1173,8 @@ msgid "Searching for \"%s\""
 msgstr "\"%s\" ��������"
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' �̒��ɂ͌��‚���܂���: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' �̒��ɂ͂���܂���: \"%s\""
 
 msgid "Source Vim script"
 msgstr "Vim�X�N���v�g�̎捞��"
@@ -1263,6 +1203,10 @@ msgstr "�s %ld: %s ���捞��"
 msgid "finished sourcing %s"
 msgstr "%s �̎捞������"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "%s �̎��s���p�����ł�"
+
 msgid "modeline"
 msgstr "���[�h�s"
 
@@ -1466,6 +1410,9 @@ msgstr ""
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ɂ�2�‚̐��l�̈������K�v�ł�"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() �̒��ł� :redir �͎g���܂���"
+
 msgid "Save Redirection"
 msgstr "���_�C���N�g��ۑ����܂�"
 
@@ -1674,6 +1621,9 @@ msgstr "��"
 msgid "Input Line"
 msgstr "���͍s"
 
+msgid "Debug Line"
+msgstr "�f�o�b�O�s"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ���R�}���h���𒴂��܂���"
 
@@ -1919,11 +1869,6 @@ msgstr "1 ����"
 msgid "%lld characters"
 msgstr "%lld ����"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld ����"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -2003,9 +1948,6 @@ msgstr "E462: \"%s\" �������[�h���鏀�����ł��܂���ł���"
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �̓����[�h�ł��܂���ł���"
 
-msgid "--Deleted--"
-msgstr "--�폜��--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <�o�b�t�@=%d> �������I�ɍ폜����܂�"
@@ -2015,6 +1957,12 @@ msgstr "autocommand: %s <�o�b�t�@=%d> �������I�ɍ폜����܂�"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���̃O���[�v�͂���܂���: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: �g�p���� augroup ���������Ƃ��Ă��܂�"
+
+msgid "--Deleted--"
+msgstr "--�폜��--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �̌�ɕs���ȕ���������܂���: %s"
@@ -2076,8 +2024,10 @@ msgid "E351: Cannot delete fold with cur
 msgstr "E351: ���݂� 'foldmethod' �ł͐܏�݂��폜�ł��܂���"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �s���܏�܂�܂��� "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld �s���܏�܂�܂��� "
+msgstr[1] "+--%3ld �s���܏�܂�܂��� "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: �Ǎ��o�b�t�@�֒lj�"
@@ -2170,6 +2120,18 @@ msgstr "Vim �_�C�A���O"
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ���b�Z�[�W�ƃR�[���o�b�N�̂��� BalloonEval ���쐬�ł��܂���"
 
+msgid "_Cancel"
+msgstr "�L�����Z��(_C)"
+
+msgid "_Save"
+msgstr "�ۑ�(_S)"
+
+msgid "_Open"
+msgstr "�J��(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2179,6 +2141,12 @@ msgstr ""
 "������(&N)\n"
 "�L�����Z��(&C)"
 
+msgid "Yes"
+msgstr "�͂�"
+
+msgid "No"
+msgstr "������"
+
 msgid "Input _Methods"
 msgstr "�C���v�b�g���\\�b�h"
 
@@ -2212,18 +2180,18 @@ msgstr "��"
 msgid "Down"
 msgstr "��"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "��������"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "�u��"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "�S�Ēu��"
 
+msgid "_Close"
+msgstr "�‚���(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: �Z�b�V�����}�l�[�W������ \"die\" �v�����󂯎��܂���\n"
 
@@ -2275,17 +2243,6 @@ msgstr "�S�Ēu��(&A)"
 msgid "&Undo"
 msgstr "�A���h�D(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�͌��‚���܂���"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: �����̓T�|�[�g����܂���: \"-%s\"; OLE�ł��g�p���Ă�������."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDI�A�v���̒��ł̓E�B���h�E���J���܂���"
-
 msgid "Open tab..."
 msgstr "�^�u�y�[�W���J��"
 
@@ -2303,6 +2260,17 @@ msgstr "�g���܂���"
 msgid "Directory\t*.nothing\n"
 msgstr "�f�B���N�g��\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�͌��‚���܂���"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: �����̓T�|�[�g����܂���: \"-%s\"; OLE�ł��g�p���Ă�������."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI�A�v���̒��ł̓E�B���h�E���J���܂���"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �F�w�肪�������Ȃ��̂ŃG���g�������蓖�Ă��܂���"
 
@@ -2564,6 +2532,7 @@ msgstr "%-5s: %s%*s (�g�p�@: %s)"
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2574,6 +2543,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ���̃V���{���ɑ΂�������T��\n"
 "       c: ���̊֐����Ă�ł���֐���T��\n"
 "       d: ���̊֐�����Ă�ł���֐���T��\n"
 "       e: ����egrep�p�^�[����T��\n"
@@ -2701,19 +2671,6 @@ msgstr "�͈͊O�̍s�ԍ��ł�"
 msgid "not allowed in the Vim sandbox"
 msgstr "�T���h�{�b�N�X�ł͋�����܂���"
 
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
-
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"���̃R�}���h�͖����ł�, ���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
-
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: �T���h�{�b�N�X�ł� Safe ���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����"
-"�Ă��܂�"
-
 msgid "E836: This Vim cannot execute :python after using :py3"
 msgstr "E836: ����Vim�ł� :py3 ���g������� :python ���g���܂���"
 
@@ -2769,95 +2726,6 @@ msgstr "E272: ��舵���Ȃ�������O������܂�"
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ���m��longjmp���: %d"
 
-msgid "Toggle implementation/definition"
-msgstr "�����ƒ�`��؂�ւ���"
-
-msgid "Show base class of"
-msgstr "���̃N���X�̊���\\��"
-
-msgid "Show overridden member function"
-msgstr "�I�[�o�[���C�h���ꂽ�����o�֐���\\��"
-
-msgid "Retrieve from file"
-msgstr "�t�@�C������񕜂���"
-
-msgid "Retrieve from project"
-msgstr "�v���W�F�N�g����񕜂���"
-
-msgid "Retrieve from all projects"
-msgstr "�S�Ẵv���W�F�N�g����񕜂���"
-
-msgid "Retrieve"
-msgstr "��"
-
-msgid "Show source of"
-msgstr "���̃\\�[�X��\\������"
-
-msgid "Find symbol"
-msgstr "���‚����V���{��"
-
-msgid "Browse class"
-msgstr "�N���X���Q��"
-
-msgid "Show class in hierarchy"
-msgstr "�K�w�ŃN���X��\\��"
-
-msgid "Show class in restricted hierarchy"
-msgstr "���肳�ꂽ�K�w�ŃN���X��\\��"
-
-msgid "Xref refers to"
-msgstr "Xref �̎Q�Ɛ�"
-
-msgid "Xref referred by"
-msgstr "Xref ���Q�Ƃ����"
-
-msgid "Xref has a"
-msgstr "Xref �����̂��̂������Ă��܂�"
-
-msgid "Xref used by"
-msgstr "Xref ���g�p�����"
-
-msgid "Show docu of"
-msgstr "���̕��͂�\\��"
-
-msgid "Generate docu for"
-msgstr "���̕��͂𐶐�"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+�ɐڑ��ł��܂���. �‹����`�F�b�N���Ă�������(sniffemacs �� $PATH �ɂȂ�"
-"��΂Ȃ�܂���).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: �Ǎ����ɃG���[���������܂���. �ؒf���܂���"
-
-msgid "SNiFF+ is currently "
-msgstr "����SNiFF+ �̏�Ԃ́u"
-
-msgid "not "
-msgstr "��"
-
-msgid "connected"
-msgstr "�ڑ��v�ł�"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: ���m�� SNiFF+ ���N�G�X�g�ł�: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+ �ւ̐ڑ����̃G���[�ł�"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ �ɐڑ�����Ă��܂���"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SNiFF+ �o�b�t�@������܂���"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: �����ݒ��ɃG���[�����������̂Őؒf���܂���"
-
 msgid "invalid buffer number"
 msgstr "�����ȃo�b�t�@�ԍ��ł�"
 
@@ -2944,6 +2812,14 @@ msgstr "E573: �����ȃT�[�o�[ID���g���܂���: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���̂̓o�^�v���p�e�B���s���ł�. �������܂���!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ���X�g�^�ɃJ���}������܂���: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ���X�g�^�̍Ō�� ']' ������܂���: %s"
+
 msgid "Unknown option argument"
 msgstr "���m�̃I�v�V���������ł�"
 
@@ -2969,12 +2845,12 @@ msgstr "%d �‚̃t�@�C�����ҏW���T���Ă��܂�\n"
 msgid "netbeans is not supported with this GUI\n"
 msgstr "netbeans �͂���GUI�ł͗��p�ł��܂���\n"
 
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' �g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
+
 msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim�ɂ�diff�@�\\������܂���(�R���p�C�����ݒ�)."
 
-msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "'-nb' �g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
-
 msgid "Attempt to open script file again: \""
 msgstr "�X�N���v�g�t�@�C�����ĂъJ���Ă݂܂�: \""
 
@@ -2987,6 +2863,9 @@ msgstr "�X�N���v�g�o�͗p���J���܂���"
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: �G���[: NetBeans����gvim���X�^�[�g�ł��܂���\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: �G���[: ���̃o�[�W������Vim��Cygwin�[���ł͓��삵�܂���\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �x��: �[���ւ̏o�͂ł͂���܂���\n"
 
@@ -3151,6 +3030,9 @@ msgstr "-F\t\t\t�y���V�A�ꃂ�[�h�ŋN������"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t�[���� <terminal> �ɐݒ肷��"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t���o�͂��[���łȂ��Ƃ̌x�����X�L�b�v����"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc�̑���� <vimrc> ���g��"
 
@@ -3821,15 +3703,13 @@ msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) �ʂ̃v���O�����������t�@�C����ҏW���Ă��邩������܂���.\n"
 "    ���̏ꍇ�ɂ�, �ύX�����Ă��܂���1�‚̃t�@�C���ɑ΂��ĈقȂ�2�‚�\n"
-"    �C���X�^���X���ł��Ă��܂��̂�, �������Ȃ��悤�ɋC���‚��Ă�������."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "    �I�����邩, ���ӂ��Ȃ��瑱���Ă�������.\n"
+"    �C���X�^���X���ł��Ă��܂��̂�, �������Ȃ��悤�ɋC���‚��Ă�������.\n"
+"    �I�����邩, ���ӂ��Ȃ��瑱���Ă�������.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ���̃t�@�C���̕ҏW�Z�b�V�������N���b�V������.\n"
@@ -4275,25 +4155,27 @@ msgid "%ld Cols; "
 msgstr "%ld ��; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld �o�C�g"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "�I�� %s%ld / %ld �s; %lld / %lld �P��; %lld / %lld �o�C�g"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld ����; %ld / %ld �o�C�g"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "�� %s / %s; �s %ld of %ld; �P�� %ld / %ld; �o�C�g %ld / %ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"�I�� %s%ld / %ld �s; %lld / %lld �P��; %lld / %lld ����; %lld / %lld �o�C�g"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "�� %s / %s; �s %ld of %ld; �P�� %lld / %lld; �o�C�g %lld / %lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"�� %s / %s; �s %ld / %ld; �P�� %ld / %ld; ���� %ld / %ld; �o�C�g %ld of %ld"
+"�� %s / %s; �s %ld / %ld; �P�� %lld / %lld; ���� %lld / %lld; �o�C�g %lld of "
+"%lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4526,7 +4408,7 @@ msgid "Message"
 msgstr "���b�Z�[�W"
 
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ��80�ł͂Ȃ�����, �O���R�}���h�����s�ł��܂���"
+msgstr "'columns' �� 80 �ł͂Ȃ����߁A�O���R�}���h�����s�ł��܂���"
 
 msgid "E237: Printer selection failed"
 msgstr "E237: �v�����^�̑I���Ɏ��s���܂���"
@@ -4552,6 +4434,10 @@ msgid "E244: Illegal charset name \"%s\"
 msgstr "E244: �����Z�b�g�� \"%s\" �͕s���ł� (�t�H���g�� \"%s\")"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: �i���� \"%s\" �͕s���ł� (�t�H���g�� \"%s\")"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' �͕s���ȕ����ł� (�t�H���g�� \"%s\")"
 
@@ -4596,13 +4482,6 @@ msgstr "�Z�L�����e�B�R���e�L�X�g %s �� %s ����擾�ł��܂���. �폜���܂�!"
 
 msgid ""
 "\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�V�F�������s�ł��܂��� "
-
-msgid ""
-"\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
@@ -4631,6 +4510,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"�V�F�������s�ł��܂��� "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4672,10 +4558,6 @@ msgid "Could not fix up function pointer
 msgstr "DLL����֐��|�C���^���擾�ł��܂���ł���"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "�V�F�����R�[�h %d �ŏI�����܂���"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: �C�x���g %s �����m\n"
 
@@ -4704,6 +4586,10 @@ msgid "Vim Warning"
 msgstr "Vim�̌x��"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "�V�F�����R�[�h %d �ŏI�����܂���"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: �t�H�[�}�b�g������� %%%c �����߂��܂�"
 
@@ -4726,6 +4612,7 @@ msgstr "E376: �t�H�[�}�b�g������̑O�u�ɖ����� %%%c ������܂�"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �t�H�[�}�b�g������ɖ����� %%%c ������܂�"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �Ƀp�^�[�����w�肳��Ă��܂���"
 
@@ -4735,6 +4622,15 @@ msgstr "E379: �f�B���N�g��������������ł�"
 msgid "E553: No more items"
 msgstr "E553: �v�f����������܂���"
 
+msgid "E924: Current window was closed"
+msgstr "E924: ���݂̃E�B���h�E���‚����܂���"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ���݂� quickfix ���ύX����܂���"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ���݂̃��P�[�V�������X�g���ύX����܂���"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4742,15 +4638,18 @@ msgstr "(%d of %d)%s%s: "
 msgid " (line deleted)"
 msgstr " (�s���폜����܂���)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s �G���[�ꗗ %d of %d; %d �ƒG���["
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �X�^�b�N�̖����ł�"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �X�^�b�N�̐擪�ł�"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "�G���[�ꗗ %d of %d; %d �ƒG���["
+msgid "No entries"
+msgstr "�G���g��������܂���"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' �I�v�V�������ݒ肳��Ă���̂ŏ����݂܂���"
@@ -4986,9 +4885,6 @@ msgstr " �w�u���C"
 msgid " Arabic"
 msgstr " �A���r�A"
 
-msgid " (lang)"
-msgstr " (����)"
-
 msgid " (paste)"
 msgstr " (�\\��t��)"
 
@@ -5083,8 +4979,49 @@ msgstr ""
 "# �Ō�� %s�����p�^�[��:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: �X�y���t�@�C���̏����G���[�ł�"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: �X�y���`�F�b�N�͖���������Ă��܂�"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"�x��: �P�ꃊ�X�g \"%s_%s.spl\" ����� \"%s_ascii.spl\" �͌��‚���܂���"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"�x��: �P�ꃊ�X�g \"%s.%s.spl\" ����� \"%s.ascii.spl\" �͌��‚���܂���"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand �� SpellFileMissing ���o�b�t�@���폜���܂���"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "�x��9: %s �Ƃ����͈͂̓T�|�[�g����Ă��܂���"
+
+msgid "Sorry, no suggestions"
+msgstr "�c�O�ł���, �C�����͂���܂���"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "�c�O�ł���, �C������ %ld �‚�������܂���"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" �����֕ϊ�:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: �X�y���u�����܂����s����Ă��܂���"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ���‚���܂���: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: �X�y���t�@�C�����؎���Ă���悤�ł�"
@@ -5107,19 +5044,6 @@ msgstr "E762: FOL, LOW �������� UPP �̕������͈͊O�ł�"
 msgid "Compressing word tree..."
 msgstr "�P��c���[�����k���Ă��܂�..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: �X�y���`�F�b�N�͖���������Ă��܂�"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"�x��: �P�ꃊ�X�g \"%s_%s.spl\" ����� \"%s_ascii.spl\" �͌��‚���܂���"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"�x��: �P�ꃊ�X�g \"%s.%s.spl\" ����� \"%s.ascii.spl\" �͌��‚���܂���"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "�X�y���t�@�C�� \"%s\" ��Ǎ���"
@@ -5137,8 +5061,24 @@ msgid "E770: Unsupported section in spel
 msgstr "E770: �X�y���t�@�C���ɃT�|�[�g���Ă��Ȃ��Z�N�V����������܂�"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "�x��9: %s �Ƃ����͈͂̓T�|�[�g����Ă��܂���"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug �t�@�C���ł͂Ȃ��悤�ł�: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: �Â� .sug �t�@�C���Ȃ̂�, �A�b�v�f�[�g���Ă�������: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ���V�����o�[�W������ Vim �p�� .sug �t�@�C���ł�: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug �t�@�C���� .spl �t�@�C���ƈ�v���܂���: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug �t�@�C���̓Ǎ����ɃG���[���������܂���: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5409,50 +5349,6 @@ msgstr "�P�� '%.*s' �� %s �֒lj�����܂���"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: �P��̕������X�y���t�@�C���ƈقȂ�܂�"
 
-msgid "Sorry, no suggestions"
-msgstr "�c�O�ł���, �C�����͂���܂���"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "�c�O�ł���, �C������ %ld �‚�������܂���"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" �����֕ϊ�:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: �X�y���u�����܂����s����Ă��܂���"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ���‚���܂���: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug �t�@�C���ł͂Ȃ��悤�ł�: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: �Â� .sug �t�@�C���Ȃ̂�, �A�b�v�f�[�g���Ă�������: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ���V�����o�[�W������ Vim �p�� .sug �t�@�C���ł�: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug �t�@�C���� .spl �t�@�C���ƈ�v���܂���: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug �t�@�C���̓Ǎ����ɃG���[���������܂���: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5789,6 +5685,9 @@ msgstr ""
 "\n"
 "--- �[���L�[ ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt���J���܂���"
+
 msgid "new shell started\n"
 msgstr "�V�����V�F�����N�����܂�\n"
 
@@ -5936,6 +5835,130 @@ msgstr "E439: �A���h�D���X�g�����Ă��܂�"
 msgid "E440: undo line missing"
 msgstr "E440: �A���h�D�s������܂���"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �֐� %s �͒�`�ςł�, �Ē�`����ɂ� ! ��lj����Ă�������"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: �����^���ɃG���g�������ɑ��݂��܂�"
+
+msgid "E718: Funcref required"
+msgstr "E718: �֐��Q�ƌ^���v������܂�"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ���m�̊֐��ł�: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: �s���Ȉ����ł�: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ���������d�����Ă��܂�: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: �֐��̈��������߂��܂�: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: �֐��̖����Ȉ����ł�: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: �֐��ďo�̓���q���� 'maxfuncdepth' �𒴂��܂���"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s �����s���ł�"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s �����f����܂���"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s �� #%ld ��Ԃ��܂���"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s �� %s ��Ԃ��܂���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ���������߂��܂�"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ���m�̊֐��ł�: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: �֐��͍폜����܂���: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �֐��̈���������܂���: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: �X�N���v�g�ȊO��<SID>���g���܂���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����p�֐����Ă΂�܂���������������܂���: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: �֐������v������܂�"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: �֐����͑啶���� \"s:\" �Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: �֐����ɂ̓R�����͊܂߂��܂���: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: ����`�̊֐��ł�: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ������܂���: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: �����ł� g: �͎g���܂���"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: �N���[�W���[�֐��̓g�b�v���x���ɋL�q�ł��܂���: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ������܂���"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: �֐������ϐ����ƏՓ˂��܂�: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: �֐� %s ���Ē�`�ł��܂���: �g�p���ł�"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �֐������X�N���v�g�̃t�@�C�����ƈ�v���܂���: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: �֐� %s ���폜�ł��܂���: �g�p���ł�"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: �֐��O�� :return ������܂���"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: �J�b�R '(' ������܂���: %s"
+
 #. Only MS VC 4.1 and earlier can do Win32s
 msgid ""
 "\n"
@@ -5958,9 +5981,6 @@ msgstr ""
 "\n"
 "MS-Windows 32 �r�b�g GUI ��"
 
-msgid " in Win32s mode"
-msgstr " in Win32s ���[�h"
-
 msgid " with OLE support"
 msgstr " with OLE �T�|�[�g"
 
@@ -5980,27 +6000,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16 �r�b�g ��"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32 �r�b�g MS-DOS ��"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16 �r�b�g MS-DOS ��"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6092,6 +6091,9 @@ msgstr ""
 msgid "without GUI."
 msgstr "without GUI."
 
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
@@ -6155,6 +6157,9 @@ msgstr "  ��2���[�U�[ gvimrc: \""
 msgid "3rd user gvimrc file: \""
 msgstr "  ��3���[�U�[ gvimrc: \""
 
+msgid "       defaults file: \""
+msgstr "  �f�t�H���g�t�@�C��: \""
+
 msgid "    system menu file: \""
 msgstr "    �V�X�e�����j���[: \""
 
@@ -6246,10 +6251,10 @@ msgid "menu  Help->Sponsor/Register  for
 msgstr "�ڍׂ̓��j���[�� �w���v->�X�|���T�[/�o�^ ���Q�Ƃ��ĉ�����"
 
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "   �x��: Windows 95/98/Me �����o  "
+msgstr "�x��: Windows 95/98/ME �����o���܂���"
 
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr " �ڍׂȏ���          :help windows95<Enter> "
+msgstr "�ڍׂȏ���            :help windows95<Enter>"
 
 msgid "Already only one window"
 msgstr "���ɃE�B���h�E��1�‚�������܂���"
@@ -6282,9 +6287,38 @@ msgstr "E446: �J�[�\\���̉��Ƀt�@�C����������܂���"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ������ ID: %ld (1 �ȏ�łȂ���΂Ȃ�܂���)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID �͂��łɗ��p���ł�: %ld"
+
 msgid "List or number required"
 msgstr "���X�g�����l���K�v�ł�"
 
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ������ ID: %ld (1 �ȏ�łȂ���΂Ȃ�܂���)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID �͂���܂���: %ld"
+
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
+
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���̃R�}���h�͖����ł�, ���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł���."
+
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: �T���h�{�b�N�X�ł� Safe ���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ����"
+"�Ă��܂�"
+
 msgid "Edit with &multiple Vims"
 msgstr "������Vim�ŕҏW���� (&M)"
 
@@ -6561,6 +6595,28 @@ msgstr "E794: �T���h�{�b�N�X�ł͕ϐ� \"%s\" �ɒl��ݒ�ł��܂���"
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: �����^�ɋ�̃L�[���g�����Ƃ͂ł��܂���"
 
+msgid "E715: Dictionary required"
+msgstr "E715: �����^���K�v�ł�"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ���X�g�̃C���f�b�N�X���͈͊O�ł�: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �֐��̈��������߂��܂�: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: �����^�ɃL�[�����݂��܂���: %s"
+
+msgid "E714: List required"
+msgstr "E714: ���X�g�^���K�v�ł�"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �̈����̓��X�g�^�܂��͎����^�łȂ���΂Ȃ�܂���"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: �G���[�t�@�C���̓Ǎ����ɃG���[���������܂���"
 
@@ -6660,6 +6716,10 @@ msgstr "E764: �I�v�V���� '%s' �͐ݒ肳��Ă��܂���"
 msgid "E850: Invalid register name"
 msgstr "E850: �����ȃ��W�X�^���ł�"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: �f�B���N�g���� '%s' �̒��ɂ���܂���: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "��܂Ō��������̂ʼn��ɖ߂�܂�"
 
@@ -6731,11 +6791,11 @@ msgstr "�����̕ύX�Ɏ��s���܂���"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "imp.find_module() �� %s ��Ԃ��܂��� (���Ғl: 2 �v�f�̃^�v��)"
+msgstr "imp.find_module() �� %s ��Ԃ��܂��� (���Ғl: 3 �v�f�̃^�v��)"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "impl.find_module() �� %d �v�f�̃^�v����Ԃ��܂��� (���Ғl: 2)"
+msgstr "imp.find_module() �� %d �v�f�̃^�v����Ԃ��܂��� (���Ғl: 3)"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "�����G���[: imp.find_module �� NULL ���܂ރ^�v����Ԃ��܂���"
@@ -6806,9 +6866,6 @@ msgstr "�����֐� %s �͑��݂��܂���"
 msgid "function %s does not exist"
 msgstr "�֐� %s ������܂���"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "�֐��̃R���X�g���N�^�̓L�[���[�h�������󂯕t���܂���"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "�֐� %s �̎��s�Ɏ��s���܂���"
@@ -6896,6 +6953,10 @@ msgid "unable to convert %s to vim dicti
 msgstr "%s vim�̎����^�ɕϊ��ł��܂���"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ��vim�̃��X�g�ɕϊ��ł��܂���"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "%s ��vim�̍\\���̂ɕϊ��ł��܂���"