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/sshconfig.vim | 74 ++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 44 deletions(-) (limited to 'runtime/syntax/sshconfig.vim') diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index 302d073f1e..051b2f9a8a 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -10,19 +10,12 @@ " " Setup -if version >= 600 - if exists("b:current_syntax") - finish - endif -else - syntax clear +" quit when a syntax file was already loaded +if exists("b:current_syntax") + finish endif -if version >= 600 - setlocal iskeyword=_,-,a-z,A-Z,48-57 -else - set iskeyword=_,-,a-z,A-Z,48-57 -endif +setlocal iskeyword=_,-,a-z,A-Z,48-57 " case on @@ -233,40 +226,33 @@ syn keyword sshconfigKeyword VisualHostKey syn keyword sshconfigKeyword XAuthLocation " Define the default highlighting -if version >= 508 || !exists("did_sshconfig_syntax_inits") - if version < 508 - let did_sshconfig_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +command -nargs=+ HiLink hi def link - 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 -endif +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 let b:current_syntax = "sshconfig" -- 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/sshconfig.vim | 50 +++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'runtime/syntax/sshconfig.vim') diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index 051b2f9a8a..8401923e02 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -226,33 +226,31 @@ syn keyword sshconfigKeyword VisualHostKey syn keyword sshconfigKeyword XAuthLocation " Define the default highlighting -command -nargs=+ HiLink hi def link -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" -- cgit From 4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 30 Apr 2017 22:18:04 +0200 Subject: vim-patch:bc2eada5424b Updated runtime files. https://github.com/vim/vim/commit/bc2eada5424bff06f7eb77c032ecc067da52b846 NA patches: vim-patch:294740d2ac42 vim-patch:a4ce25bd987a vim-patch:7034a8374345 vim-patch:14a612fa2e57 vim-patch:aaeabfbca571 --- runtime/syntax/sshconfig.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/syntax/sshconfig.vim') diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim index 8401923e02..755d08e768 100644 --- a/runtime/syntax/sshconfig.vim +++ b/runtime/syntax/sshconfig.vim @@ -5,8 +5,8 @@ " Contributor: Leonard Ehrenfried " Contributor: Karsten Hopp " Contributor: Dean, Adam Kenneth -" Last Change: 2016 Aug 11 -" SSH Version: 7.3p1 +" Last Change: 2016 Dec 28 +" SSH Version: 7.4p1 " " Setup @@ -181,6 +181,7 @@ syn keyword sshconfigKeyword IPQoS syn keyword sshconfigKeyword IdentitiesOnly syn keyword sshconfigKeyword IdentityFile syn keyword sshconfigKeyword IgnoreUnknown +syn keyword sshconfigKeyword Include syn keyword sshconfigKeyword IPQoS syn keyword sshconfigKeyword KbdInteractiveAuthentication syn keyword sshconfigKeyword KbdInteractiveDevices -- cgit