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/fstab.vim | 114 ++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 61 deletions(-) (limited to 'runtime/syntax/fstab.vim') diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim index 3006d21fea..a17fc809a5 100644 --- a/runtime/syntax/fstab.vim +++ b/runtime/syntax/fstab.vim @@ -19,9 +19,8 @@ " let fstab_unknown_device_errors = 0 " do not highlight unknown devices as errors -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 @@ -229,66 +228,59 @@ syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster " Whole line comments syn match fsCommentLine /^#.*$/ contains=@Spell -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 fsOperator Operator - HiLink fsComment Comment - HiLink fsCommentLine Comment - - HiLink fsTypeKeyword Type - HiLink fsDeviceKeyword Identifier - HiLink fsDeviceLabel String - HiLink fsDeviceUUID String - HiLink fsDeviceSshfs String - HiLink fsFreqPassNumber Number - - if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1 - HiLink fsTypeUnknown Error - endif - - if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1 - HiLink fsDeviceError Error - endif - - HiLink fsMountPointError Error - HiLink fsMountPointKeyword Keyword - HiLink fsFreqPassError Error - - HiLink fsOptionsGeneral Type - HiLink fsOptionsKeywords Keyword - HiLink fsOptionsNumber Number - HiLink fsOptionsNumberOctal Number - HiLink fsOptionsString String - HiLink fsOptionsSize Number - HiLink fsOptionsExt2Check String - HiLink fsOptionsExt2Errors String - HiLink fsOptionsExt3Journal String - HiLink fsOptionsExt3Data String - HiLink fsOptionsExt4Journal String - HiLink fsOptionsExt4Data String - HiLink fsOptionsExt4Barrier Number - HiLink fsOptionsFatCheck String - HiLink fsOptionsConv String - HiLink fsOptionsFatType Number - HiLink fsOptionsYesNo String - HiLink fsOptionsHpfsCase String - HiLink fsOptionsIsoMap String - HiLink fsOptionsReiserHash String - HiLink fsOptionsSshYesNoAsk String - HiLink fsOptionsUfsType String - HiLink fsOptionsUfsError String - - HiLink fsOptionsVfatShortname String - - delcommand HiLink +command! -nargs=+ HiLink hi def link + +HiLink fsOperator Operator +HiLink fsComment Comment +HiLink fsCommentLine Comment + +HiLink fsTypeKeyword Type +HiLink fsDeviceKeyword Identifier +HiLink fsDeviceLabel String +HiLink fsDeviceUUID String +HiLink fsDeviceSshfs String +HiLink fsFreqPassNumber Number + +if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1 +HiLink fsTypeUnknown Error endif +if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1 +HiLink fsDeviceError Error +endif + +HiLink fsMountPointError Error +HiLink fsMountPointKeyword Keyword +HiLink fsFreqPassError Error + +HiLink fsOptionsGeneral Type +HiLink fsOptionsKeywords Keyword +HiLink fsOptionsNumber Number +HiLink fsOptionsNumberOctal Number +HiLink fsOptionsString String +HiLink fsOptionsSize Number +HiLink fsOptionsExt2Check String +HiLink fsOptionsExt2Errors String +HiLink fsOptionsExt3Journal String +HiLink fsOptionsExt3Data String +HiLink fsOptionsExt4Journal String +HiLink fsOptionsExt4Data String +HiLink fsOptionsExt4Barrier Number +HiLink fsOptionsFatCheck String +HiLink fsOptionsConv String +HiLink fsOptionsFatType Number +HiLink fsOptionsYesNo String +HiLink fsOptionsHpfsCase String +HiLink fsOptionsIsoMap String +HiLink fsOptionsReiserHash String +HiLink fsOptionsSshYesNoAsk String +HiLink fsOptionsUfsType String +HiLink fsOptionsUfsError String + +HiLink fsOptionsVfatShortname String + +delcommand HiLink + let b:current_syntax = "fstab" let &cpo = s:cpo_save -- 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/fstab.vim | 84 +++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 43 deletions(-) (limited to 'runtime/syntax/fstab.vim') diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim index a17fc809a5..39c1a00b39 100644 --- a/runtime/syntax/fstab.vim +++ b/runtime/syntax/fstab.vim @@ -228,58 +228,56 @@ syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster " Whole line comments syn match fsCommentLine /^#.*$/ contains=@Spell -command! -nargs=+ HiLink hi def link -HiLink fsOperator Operator -HiLink fsComment Comment -HiLink fsCommentLine Comment +hi def link fsOperator Operator +hi def link fsComment Comment +hi def link fsCommentLine Comment -HiLink fsTypeKeyword Type -HiLink fsDeviceKeyword Identifier -HiLink fsDeviceLabel String -HiLink fsDeviceUUID String -HiLink fsDeviceSshfs String -HiLink fsFreqPassNumber Number +hi def link fsTypeKeyword Type +hi def link fsDeviceKeyword Identifier +hi def link fsDeviceLabel String +hi def link fsDeviceUUID String +hi def link fsDeviceSshfs String +hi def link fsFreqPassNumber Number if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1 -HiLink fsTypeUnknown Error +hi def link fsTypeUnknown Error endif if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1 -HiLink fsDeviceError Error +hi def link fsDeviceError Error endif -HiLink fsMountPointError Error -HiLink fsMountPointKeyword Keyword -HiLink fsFreqPassError Error - -HiLink fsOptionsGeneral Type -HiLink fsOptionsKeywords Keyword -HiLink fsOptionsNumber Number -HiLink fsOptionsNumberOctal Number -HiLink fsOptionsString String -HiLink fsOptionsSize Number -HiLink fsOptionsExt2Check String -HiLink fsOptionsExt2Errors String -HiLink fsOptionsExt3Journal String -HiLink fsOptionsExt3Data String -HiLink fsOptionsExt4Journal String -HiLink fsOptionsExt4Data String -HiLink fsOptionsExt4Barrier Number -HiLink fsOptionsFatCheck String -HiLink fsOptionsConv String -HiLink fsOptionsFatType Number -HiLink fsOptionsYesNo String -HiLink fsOptionsHpfsCase String -HiLink fsOptionsIsoMap String -HiLink fsOptionsReiserHash String -HiLink fsOptionsSshYesNoAsk String -HiLink fsOptionsUfsType String -HiLink fsOptionsUfsError String - -HiLink fsOptionsVfatShortname String - -delcommand HiLink +hi def link fsMountPointError Error +hi def link fsMountPointKeyword Keyword +hi def link fsFreqPassError Error + +hi def link fsOptionsGeneral Type +hi def link fsOptionsKeywords Keyword +hi def link fsOptionsNumber Number +hi def link fsOptionsNumberOctal Number +hi def link fsOptionsString String +hi def link fsOptionsSize Number +hi def link fsOptionsExt2Check String +hi def link fsOptionsExt2Errors String +hi def link fsOptionsExt3Journal String +hi def link fsOptionsExt3Data String +hi def link fsOptionsExt4Journal String +hi def link fsOptionsExt4Data String +hi def link fsOptionsExt4Barrier Number +hi def link fsOptionsFatCheck String +hi def link fsOptionsConv String +hi def link fsOptionsFatType Number +hi def link fsOptionsYesNo String +hi def link fsOptionsHpfsCase String +hi def link fsOptionsIsoMap String +hi def link fsOptionsReiserHash String +hi def link fsOptionsSshYesNoAsk String +hi def link fsOptionsUfsType String +hi def link fsOptionsUfsError String + +hi def link fsOptionsVfatShortname String + let b:current_syntax = "fstab" -- cgit