Fix syntax file

interru · interru · commit a6f33aba60d1 · 2013-01-19T00:40:33.000+01:00
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -1,3 +1,81 @@
+""if version < 600
+""  syntax clear
+""elseif exists("b:current_syntax")
+""  finish
+""endif
+""
+""let s:cpo_save = &cpo
+""set cpo&vim
+""
+""syn match pythonAssignment "+=\|-=\|\*=\|/=\|//=\|%=\|&=\||=\|\^=\|>>=\|<<=\|**="
+""syn match pythonAssignment "="
+""syn match pythonArithmetic "+\|-\|*\|**\|/\|//\|%\|<<\|>>\|&\||\|\^\|\~"
+""syn match pythonComparison "<\|>\|<=\|>=\|==\|!=\|<>"
+""
+""syn region pythonDocstring
+""    \ start=+^\s*[uU]\?[rR]\?"""+  end=+"""+ keepend excludenl 
+""    \ contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
+""syn region pythonDocstring
+""    \ start=+^\s*[uU]\?[rR]\?'''+ end=+'''+ keepend excludenl 
+""    \ contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
+""
+""syn region pythonCallName 
+""    \ start="[a-zA-Z_][a-zA-Z0-9_]*(" end=")" fold 
+""    \ contains=pythonCall keepend extend
+""syn region pythonCall 
+""    \ start="("ms=s+1 end=")$"me=e-1 contained 
+""    \ contains=pythonCallArgs,@pythonExpression
+""    \ containedin=pythonFunction
+""syn match pythonCallArgs "[^,]" contained 
+""    \ contains=pythonCallKeyword,pythonCallName,@pythonExpression skipwhite
+""syn match pythonCallKeyword 
+""    \ "[a-zA-Z_][a-zA-Z0-9_]\+\s*=[^=]\{1\}"me=e-1 display contained 
+""    \ contains=pythonKeyAssign skipwhite
+""syn match pythonKeyAssign "=" display contained
+""
+""syn match pythonDot "\." display containedin=pythonFunction
+""
+""
+""syn keyword pythonBuiltinFunc __import__ abs all any apply basestring bin
+""    \ bool buffer bytearray bytes callable chr classmethod cmp coerce compile
+""    \ complex delattr dict dir divmod enumerate eval execfile file filter
+""    \ float format frozenset getattr globals hasattr hash help hex id input
+""    \ int intern isinstance issubclass iter len list locals long map max min
+""    \ next object oct open ord pow property range raw_input reduce reload repr
+""    \ reversed round set setattr slice sorted staticmethod str sum super tuple
+""    \ type unichr unicode vars xrange zip
+""syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented __debug__
+""    \ __doc__ __file__ __name__ __package__
+""
+""
+""syn cluster pythonExpression 
+""    \ contains=pythonComparison,pythonOperator,pythonDot,@pythonStringType,
+""              \@pythonNumberType,@pythonBuiltin,pythonFuncCall
+""syn cluster pythonStringType
+""    \ contains=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+""syn cluster pythonNumberType contains=pythonNumber,pythonHexNumber,pythonFloat
+""
+""
+""hi link pythonOperator     Operator
+""hi link pythonAssignment   Operator
+""hi link pythonArithmetic   Operator
+""hi link pythonComparison   Operator
+""hi link pythonDocstring    Comment
+""hi link pythonInclude      PreCondit
+""
+""hi link pythonBuiltinFunc  Function
+""hi link pythonBuiltinObj   Structure
+""
+""hi link pythonDot          Comment
+""hi link pythonCallKeyword  Identifier
+""hi link pythonKeyAssign    Operator
+""
+""
+""let &cpo = s:cpo_save
+""unlet s:cpo_save
+""
+""
+""
 " Vim syntax file
 "
 " Modification:
@@ -79,14 +157,12 @@
 "    For "print" builtin as function:
 "       python_print_as_function
 
-" DESC: Disable script loading
-if !pymode#Option('syntax') || pymode#Default('b:current_syntax', 'python')
-    finish
-endif
-
 " 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
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
 endif
 
 if exists("python_highlight_all") && python_highlight_all != 0
