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/forth.vim | 105 ++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 60 deletions(-) (limited to 'runtime/syntax/forth.vim') diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim index 99e9400b95..2559779f54 100644 --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -80,11 +80,8 @@ " -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -104,11 +101,7 @@ syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\=' " Characters allowed in keywords " I don't know if 128-255 are allowed in ANS-FORTH -if version >= 600 - setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 -else - set iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 -endif +setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 " when wanted, highlight trailing white space if exists("forth_space_errors") @@ -289,56 +282,48 @@ syn match forthLocals '{ }' " otherwise, at least two spaces between syn region forthDeprecated start='locals|' end='|' " 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_forth_syn_inits") - if version < 508 - let did_forth_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " 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 - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" 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 + +delcommand HiLink let b:current_syntax = "forth" -- 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/forth.vim | 76 +++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'runtime/syntax/forth.vim') diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim index 2559779f54..35fafd4349 100644 --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -283,47 +283,45 @@ syn region forthDeprecated start='locals|' end='|' " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " 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 - -delcommand HiLink +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 + let b:current_syntax = "forth" -- cgit