diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-30 23:26:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-30 23:26:57 +0200 |
| commit | 89bcfda6834aba724d12554a34b9ed49f5789fd5 (patch) | |
| tree | 2ffddcadaae9d061e38e17a09b2635ec199eb1dd /runtime/syntax/xdefaults.vim | |
| parent | 4792255eff03760dca0fd014616532e6d47db364 (diff) | |
| download | vim-git-89bcfda6834aba724d12554a34b9ed49f5789fd5.tar.gz | |
Updated runtime files. Remove version checks for Vim older than 6.0.
Diffstat (limited to 'runtime/syntax/xdefaults.vim')
| -rw-r--r-- | runtime/syntax/xdefaults.vim | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim index 5e38952a7..1dfcc34ae 100644 --- a/runtime/syntax/xdefaults.vim +++ b/runtime/syntax/xdefaults.vim @@ -10,11 +10,8 @@ " xrdb manual page " xrdb source: ftp://ftp.x.org/pub/R6.4/xc/programs/xrdb/xrdb.c -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -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 @@ -109,36 +106,28 @@ syn keyword xdefaultsSymbol contained X_RESOLUTION syn keyword xdefaultsSymbol contained Y_RESOLUTION " 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_xdefaults_syntax_inits") - if version < 508 - let did_xdefaults_syntax_inits = 1 - command -nargs=+ HiLink hi link <args> - else - command -nargs=+ HiLink hi def link <args> - endif - HiLink xdefaultsLabel Type - HiLink xdefaultsValue Constant - HiLink xdefaultsComment Comment - HiLink xdefaultsCommentH xdefaultsComment - HiLink xdefaultsPreProc PreProc - HiLink xdefaultsInclude xdefaultsPreProc - HiLink xdefaultsCppSkip xdefaultsCppOut - HiLink xdefaultsCppOut2 xdefaultsCppOut - HiLink xdefaultsCppOut Comment - HiLink xdefaultsIncluded String - HiLink xdefaultsDefine Macro - HiLink xdefaultsSymbol Statement - HiLink xdefaultsSpecial Statement - HiLink xdefaultsErrorLine Error - HiLink xdefaultsCommentError Error - HiLink xdefaultsPunct Normal - HiLink xdefaultsLineEnd Special - HiLink xdefaultsTodo Todo - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link <args> +HiLink xdefaultsLabel Type +HiLink xdefaultsValue Constant +HiLink xdefaultsComment Comment +HiLink xdefaultsCommentH xdefaultsComment +HiLink xdefaultsPreProc PreProc +HiLink xdefaultsInclude xdefaultsPreProc +HiLink xdefaultsCppSkip xdefaultsCppOut +HiLink xdefaultsCppOut2 xdefaultsCppOut +HiLink xdefaultsCppOut Comment +HiLink xdefaultsIncluded String +HiLink xdefaultsDefine Macro +HiLink xdefaultsSymbol Statement +HiLink xdefaultsSpecial Statement +HiLink xdefaultsErrorLine Error +HiLink xdefaultsCommentError Error +HiLink xdefaultsPunct Normal +HiLink xdefaultsLineEnd Special +HiLink xdefaultsTodo Todo + +delcommand HiLink let b:current_syntax = "xdefaults" |