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/resolv.vim | 62 +++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) (limited to 'runtime/syntax/resolv.vim') diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim index 06d6885c1c..1744e66f82 100644 --- a/runtime/syntax/resolv.vim +++ b/runtime/syntax/resolv.vim @@ -9,9 +9,8 @@ " David Necas (Yeti) " Stefano Zacchiroli -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 @@ -50,38 +49,31 @@ syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contai " Additional errors syn match resolvError /^search .\{257,}/ -if version >= 508 || !exists("did_config_syntax_inits") - if version < 508 - let did_config_syntax_inits = 1 - command! -nargs=+ HiLink hi link - else - command! -nargs=+ HiLink hi def link - endif - - HiLink resolvIP Number - HiLink resolvIPNetmask Number - HiLink resolvHostname String - HiLink resolvOption String - - HiLink resolvIPNameserver Number - HiLink resolvHostnameSearch String - HiLink resolvIPNetmaskSortList Number - - HiLink resolvNameServer Identifier - HiLink resolvLwserver Identifier - HiLink resolvDomain Identifier - HiLink resolvSearch Identifier - HiLink resolvSortList Identifier - HiLink resolvOptions Identifier - - HiLink resolvComment Comment - HiLink resolvOperator Operator - HiLink resolvError Error - HiLink resolvIPError Error - HiLink resolvIPSpecial Special - - delcommand HiLink -endif +command! -nargs=+ HiLink hi def link + +HiLink resolvIP Number +HiLink resolvIPNetmask Number +HiLink resolvHostname String +HiLink resolvOption String + +HiLink resolvIPNameserver Number +HiLink resolvHostnameSearch String +HiLink resolvIPNetmaskSortList Number + +HiLink resolvNameServer Identifier +HiLink resolvLwserver Identifier +HiLink resolvDomain Identifier +HiLink resolvSearch Identifier +HiLink resolvSortList Identifier +HiLink resolvOptions Identifier + +HiLink resolvComment Comment +HiLink resolvOperator Operator +HiLink resolvError Error +HiLink resolvIPError Error +HiLink resolvIPSpecial Special + +delcommand HiLink let b:current_syntax = "resolv" -- 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/resolv.vim | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'runtime/syntax/resolv.vim') diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim index 1744e66f82..a879116a5f 100644 --- a/runtime/syntax/resolv.vim +++ b/runtime/syntax/resolv.vim @@ -49,31 +49,29 @@ syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contai " Additional errors syn match resolvError /^search .\{257,}/ -command! -nargs=+ HiLink hi def link - -HiLink resolvIP Number -HiLink resolvIPNetmask Number -HiLink resolvHostname String -HiLink resolvOption String - -HiLink resolvIPNameserver Number -HiLink resolvHostnameSearch String -HiLink resolvIPNetmaskSortList Number - -HiLink resolvNameServer Identifier -HiLink resolvLwserver Identifier -HiLink resolvDomain Identifier -HiLink resolvSearch Identifier -HiLink resolvSortList Identifier -HiLink resolvOptions Identifier - -HiLink resolvComment Comment -HiLink resolvOperator Operator -HiLink resolvError Error -HiLink resolvIPError Error -HiLink resolvIPSpecial Special - -delcommand HiLink + +hi def link resolvIP Number +hi def link resolvIPNetmask Number +hi def link resolvHostname String +hi def link resolvOption String + +hi def link resolvIPNameserver Number +hi def link resolvHostnameSearch String +hi def link resolvIPNetmaskSortList Number + +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 + +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 + let b:current_syntax = "resolv" -- cgit