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/xkb.vim | 76 ++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 43 deletions(-) (limited to 'runtime/syntax/xkb.vim') diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim index ff9bfd0dae..efb7d66c0c 100644 --- a/runtime/syntax/xkb.vim +++ b/runtime/syntax/xkb.vim @@ -6,12 +6,9 @@ " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim " 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 syn case match @@ -50,42 +47,35 @@ syn keyword xkbTModif default hidden partial virtual syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types " Define the default highlighting -if version >= 508 || !exists("did_xkb_syntax_inits") - if version < 508 - let did_xkb_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink xkbModif xkbPreproc - HiLink xkbTModif xkbPreproc - HiLink xkbPreproc Preproc - - HiLink xkbIdentifier Keyword - HiLink xkbFunction Function - HiLink xkbSect Type - HiLink xkbPhysicalKey Identifier - HiLink xkbKeyword Keyword - - HiLink xkbComment Comment - HiLink xkbTodo Todo - - HiLink xkbConstant Constant - HiLink xkbString String - - HiLink xkbSpecialChar xkbSpecial - HiLink xkbSpecial Special - - HiLink xkbParenError xkbBalancingError - HiLink xkbBraceError xkbBalancingError - HiLink xkbBraketError xkbBalancingError - HiLink xkbBalancingError xkbError - HiLink xkbCommentStartError xkbCommentError - HiLink xkbCommentError xkbError - HiLink xkbError Error - - delcommand HiLink -endif +command -nargs=+ HiLink hi def link + +HiLink xkbModif xkbPreproc +HiLink xkbTModif xkbPreproc +HiLink xkbPreproc Preproc + +HiLink xkbIdentifier Keyword +HiLink xkbFunction Function +HiLink xkbSect Type +HiLink xkbPhysicalKey Identifier +HiLink xkbKeyword Keyword + +HiLink xkbComment Comment +HiLink xkbTodo Todo + +HiLink xkbConstant Constant +HiLink xkbString String + +HiLink xkbSpecialChar xkbSpecial +HiLink xkbSpecial Special + +HiLink xkbParenError xkbBalancingError +HiLink xkbBraceError xkbBalancingError +HiLink xkbBraketError xkbBalancingError +HiLink xkbBalancingError xkbError +HiLink xkbCommentStartError xkbCommentError +HiLink xkbCommentError xkbError +HiLink xkbError Error + +delcommand HiLink let b:current_syntax = "xkb" -- 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/xkb.vim | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'runtime/syntax/xkb.vim') diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim index efb7d66c0c..59fc497e62 100644 --- a/runtime/syntax/xkb.vim +++ b/runtime/syntax/xkb.vim @@ -47,35 +47,33 @@ syn keyword xkbTModif default hidden partial virtual syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types " Define the default highlighting -command -nargs=+ HiLink hi def link -HiLink xkbModif xkbPreproc -HiLink xkbTModif xkbPreproc -HiLink xkbPreproc Preproc +hi def link xkbModif xkbPreproc +hi def link xkbTModif xkbPreproc +hi def link xkbPreproc Preproc -HiLink xkbIdentifier Keyword -HiLink xkbFunction Function -HiLink xkbSect Type -HiLink xkbPhysicalKey Identifier -HiLink xkbKeyword Keyword +hi def link xkbIdentifier Keyword +hi def link xkbFunction Function +hi def link xkbSect Type +hi def link xkbPhysicalKey Identifier +hi def link xkbKeyword Keyword -HiLink xkbComment Comment -HiLink xkbTodo Todo +hi def link xkbComment Comment +hi def link xkbTodo Todo -HiLink xkbConstant Constant -HiLink xkbString String +hi def link xkbConstant Constant +hi def link xkbString String -HiLink xkbSpecialChar xkbSpecial -HiLink xkbSpecial Special +hi def link xkbSpecialChar xkbSpecial +hi def link xkbSpecial Special -HiLink xkbParenError xkbBalancingError -HiLink xkbBraceError xkbBalancingError -HiLink xkbBraketError xkbBalancingError -HiLink xkbBalancingError xkbError -HiLink xkbCommentStartError xkbCommentError -HiLink xkbCommentError xkbError -HiLink xkbError Error +hi def link xkbParenError xkbBalancingError +hi def link xkbBraceError xkbBalancingError +hi def link xkbBraketError xkbBalancingError +hi def link xkbBalancingError xkbError +hi def link xkbCommentStartError xkbCommentError +hi def link xkbCommentError xkbError +hi def link xkbError Error -delcommand HiLink let b:current_syntax = "xkb" -- cgit