summaryrefslogtreecommitdiffstats
path: root/runtime/syntax/expect.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/syntax/expect.vim')
-rw-r--r--runtime/syntax/expect.vim57
1 files changed, 23 insertions, 34 deletions
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
index 6ff7d4142c..4f05259fc1 100644
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -4,11 +4,8 @@
" Last Change: 2012 Jun 01
" (Dominique Pelle added @Spell)
-" 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
@@ -81,35 +78,27 @@ syn match expectComment "#.*$" contains=@Spell,expectTodo
syn match expectSharpBang "\%^#!.*"
" 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_expect_syntax_inits")
- if version < 508
- let did_expect_syntax_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
-
- HiLink expectSharpBang PreProc
- HiLink expectVariables Special
- HiLink expectCommand Function
- HiLink expectStatement Statement
- HiLink expectConditional Conditional
- HiLink expectRepeat Repeat
- HiLink expectExpectOpts Keyword
- HiLink expectOutVar Special
- HiLink expectSpecial Special
- HiLink expectNumber Number
-
- HiLink expectString String
-
- HiLink expectComment Comment
- HiLink expectTodo Todo
- "HiLink expectIdentifier Identifier
-
- delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink expectSharpBang PreProc
+HiLink expectVariables Special
+HiLink expectCommand Function
+HiLink expectStatement Statement
+HiLink expectConditional Conditional
+HiLink expectRepeat Repeat
+HiLink expectExpectOpts Keyword
+HiLink expectOutVar Special
+HiLink expectSpecial Special
+HiLink expectNumber Number
+
+HiLink expectString String
+
+HiLink expectComment Comment
+HiLink expectTodo Todo
+"HiLink expectIdentifier Identifier
+
+delcommand HiLink
let b:current_syntax = "expect"