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/nroff.vim | 115 +++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 64 deletions(-) (limited to 'runtime/syntax/nroff.vim') diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim index 280ba9e7d9..2619d02c44 100644 --- a/runtime/syntax/nroff.vim +++ b/runtime/syntax/nroff.vim @@ -22,12 +22,9 @@ " " {{{1 Start syntax highlighting. " -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded +" quit when a syntax file was already loaded " -if version < 600 - syntax clear -elseif exists("b:current_syntax") +if exists("b:current_syntax") finish endif @@ -197,65 +194,55 @@ syn keyword nroffTodo TODO XXX FIXME contained " " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -" -if version >= 508 || !exists("did_nroff_syn_inits") - - if version < 508 - let did_nroff_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink nroffEscChar nroffSpecialChar - HiLink nroffEscCharAr nroffSpecialChar - HiLink nroffSpecialChar SpecialChar - HiLink nroffSpace Delimiter - - HiLink nroffEscRegArg2 nroffEscRegArg - HiLink nroffEscRegArg nroffIdent - - HiLink nroffEscArg2 nroffEscArg - HiLink nroffEscPar nroffEscape - - HiLink nroffEscRegPar nroffEscape - HiLink nroffEscArg nroffEscape - HiLink nroffSize nroffEscape - HiLink nroffEscape Preproc - - HiLink nroffIgnore Comment - HiLink nroffComment Comment - HiLink nroffTodo Todo - - HiLink nroffReqLeader nroffRequest - HiLink nroffReqName nroffRequest - HiLink nroffRequest Statement - HiLink nroffCond PreCondit - HiLink nroffDefIdent nroffIdent - HiLink nroffIdent Identifier - - HiLink nroffEquation PreProc - HiLink nroffTable PreProc - HiLink nroffPicture PreProc - HiLink nroffRefer PreProc - HiLink nroffGrap PreProc - HiLink nroffGremlin PreProc - - HiLink nroffNumber Number - HiLink nroffBadChar nroffError - HiLink nroffSpaceError nroffError - HiLink nroffError Error - - HiLink nroffPreserve String - HiLink nroffString String - HiLink nroffDefinition String - HiLink nroffDefSpecial Special - - delcommand HiLink - -endif +" Only when an item doesn't have highlighting yet +" +command -nargs=+ HiLink hi def link + +HiLink nroffEscChar nroffSpecialChar +HiLink nroffEscCharAr nroffSpecialChar +HiLink nroffSpecialChar SpecialChar +HiLink nroffSpace Delimiter + +HiLink nroffEscRegArg2 nroffEscRegArg +HiLink nroffEscRegArg nroffIdent + +HiLink nroffEscArg2 nroffEscArg +HiLink nroffEscPar nroffEscape + +HiLink nroffEscRegPar nroffEscape +HiLink nroffEscArg nroffEscape +HiLink nroffSize nroffEscape +HiLink nroffEscape Preproc + +HiLink nroffIgnore Comment +HiLink nroffComment Comment +HiLink nroffTodo Todo + +HiLink nroffReqLeader nroffRequest +HiLink nroffReqName nroffRequest +HiLink nroffRequest Statement +HiLink nroffCond PreCondit +HiLink nroffDefIdent nroffIdent +HiLink nroffIdent Identifier + +HiLink nroffEquation PreProc +HiLink nroffTable PreProc +HiLink nroffPicture PreProc +HiLink nroffRefer PreProc +HiLink nroffGrap PreProc +HiLink nroffGremlin PreProc + +HiLink nroffNumber Number +HiLink nroffBadChar nroffError +HiLink nroffSpaceError nroffError +HiLink nroffError Error + +HiLink nroffPreserve String +HiLink nroffString String +HiLink nroffDefinition String +HiLink nroffDefSpecial Special + +delcommand HiLink let b:current_syntax = "nroff" -- 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/nroff.vim | 92 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) (limited to 'runtime/syntax/nroff.vim') diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim index 2619d02c44..3a8cf95856 100644 --- a/runtime/syntax/nroff.vim +++ b/runtime/syntax/nroff.vim @@ -196,53 +196,51 @@ syn keyword nroffTodo TODO XXX FIXME contained " Define the default highlighting. " Only when an item doesn't have highlighting yet " -command -nargs=+ HiLink hi def link - -HiLink nroffEscChar nroffSpecialChar -HiLink nroffEscCharAr nroffSpecialChar -HiLink nroffSpecialChar SpecialChar -HiLink nroffSpace Delimiter - -HiLink nroffEscRegArg2 nroffEscRegArg -HiLink nroffEscRegArg nroffIdent - -HiLink nroffEscArg2 nroffEscArg -HiLink nroffEscPar nroffEscape - -HiLink nroffEscRegPar nroffEscape -HiLink nroffEscArg nroffEscape -HiLink nroffSize nroffEscape -HiLink nroffEscape Preproc - -HiLink nroffIgnore Comment -HiLink nroffComment Comment -HiLink nroffTodo Todo - -HiLink nroffReqLeader nroffRequest -HiLink nroffReqName nroffRequest -HiLink nroffRequest Statement -HiLink nroffCond PreCondit -HiLink nroffDefIdent nroffIdent -HiLink nroffIdent Identifier - -HiLink nroffEquation PreProc -HiLink nroffTable PreProc -HiLink nroffPicture PreProc -HiLink nroffRefer PreProc -HiLink nroffGrap PreProc -HiLink nroffGremlin PreProc - -HiLink nroffNumber Number -HiLink nroffBadChar nroffError -HiLink nroffSpaceError nroffError -HiLink nroffError Error - -HiLink nroffPreserve String -HiLink nroffString String -HiLink nroffDefinition String -HiLink nroffDefSpecial Special - -delcommand HiLink + +hi def link nroffEscChar nroffSpecialChar +hi def link nroffEscCharAr nroffSpecialChar +hi def link nroffSpecialChar SpecialChar +hi def link nroffSpace Delimiter + +hi def link nroffEscRegArg2 nroffEscRegArg +hi def link nroffEscRegArg nroffIdent + +hi def link nroffEscArg2 nroffEscArg +hi def link nroffEscPar nroffEscape + +hi def link nroffEscRegPar nroffEscape +hi def link nroffEscArg nroffEscape +hi def link nroffSize nroffEscape +hi def link nroffEscape Preproc + +hi def link nroffIgnore Comment +hi def link nroffComment Comment +hi def link nroffTodo Todo + +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 + +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 + +hi def link nroffNumber Number +hi def link nroffBadChar nroffError +hi def link nroffSpaceError nroffError +hi def link nroffError Error + +hi def link nroffPreserve String +hi def link nroffString String +hi def link nroffDefinition String +hi def link nroffDefSpecial Special + let b:current_syntax = "nroff" -- cgit