From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/javascript.vim | 94 ++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 55 deletions(-) (limited to 'runtime/syntax/javascript.vim') diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim index 1b20f987d9..e3e8262d39 100644 --- a/runtime/syntax/javascript.vim +++ b/runtime/syntax/javascript.vim @@ -10,15 +10,12 @@ " Last Change: 2012 Oct 05 " 2013 Jun 12: adjusted javaScriptRegexpString (Kevin Locke) -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded " tuning parameters: " unlet javaScript_fold if !exists("main_syntax") - if version < 600 - syntax clear - elseif exists("b:current_syntax") + " quit when a syntax file was already loaded + if exists("b:current_syntax") finish endif let main_syntax = 'javascript' @@ -29,11 +26,6 @@ endif let s:cpo_save = &cpo set cpo&vim -" Drop fold if it set but vim doesn't support it. -if version < 600 && exists("javaScript_fold") - unlet javaScript_fold -endif - syn keyword javaScriptCommentTodo TODO FIXME XXX TBD contained syn match javaScriptLineComment "\/\/.*" contains=@Spell,javaScriptCommentTodo @@ -87,51 +79,43 @@ if main_syntax == "javascript" endif " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_javascript_syn_inits") - if version < 508 - let did_javascript_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - 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 - - 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 - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link +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 + +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 + +delcommand HiLink let b:current_syntax = "javascript" if main_syntax == 'javascript' -- cgit From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:14:34 +0200 Subject: vim-patch:f37506f60f87 Updated runtime files. Remove HiLink commands. https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c --- runtime/syntax/javascript.vim | 70 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 36 deletions(-) (limited to 'runtime/syntax/javascript.vim') diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim index e3e8262d39..9589b1938f 100644 --- 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 -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 - -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 - -delcommand HiLink +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 + +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 + let b:current_syntax = "javascript" if main_syntax == 'javascript' -- cgit