fix some highlighting bugs

interru · interru · commit 5231a9034331 · 2012-03-16T20:59:46.000+01:00
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -1,15 +1,21 @@
 " Vim syntax file
-" ModAuthor: Mathias Köhler
-" Modiefied version of:
-"   Language:     Python
-"   Maintainer:	Dmitry Vasiliev <dima at hlabs dot org>
-"   URL:		    https://github.com/hdima/vim-scripts/blob/master/syntax/python/python.vim
-"   Last Change:	2012-02-11
-"   Filenames:	*.py
-"   Version:	    2.6.7
 "
-" Based on python.vim (from Vim 6.1 distribution)
-" by Neil Schemenauer <nas at python dot ca>
+" Modification:
+"
+"   Author:      Mathias Koehler
+"   Last Change: 2012-03-05
+"
+" Based on:
+"
+"   Language:    Python
+"   Maintainer:	 Dmitry Vasiliev <dima at hlabs dot org>
+"   URL:	 https://github.com/hdima/vim-scripts/blob/master/syntax/python/python.vim
+"   Last Change: 2012-02-11
+"   Filenames:	 *.py
+"   Version:     2.6.7
+"
+"   Which based on python.vim (from Vim 6.1 distribution)
+"   by Neil Schemenauer <nas at python dot ca>
 "
 " Thanks:
 "
@@ -143,9 +149,9 @@ syn region   pythonParam start="[a-zA-Z_]" end="\(,\|)\s*:\)" contained contains
 syn match pythonParamName "[a-zA-Z_][a-zA-Z0-9_]*" contained nextgroup=pythonDefaultAssignment skipwhite skipnl
 syn match pythonDefaultAssignment "=" nextgroup=pythonParamDefault skipwhite contained skipnl
 
-syn region pythonFuncCall start="[a-zA-Z_][a-zA-Z0-9_]*(" end=")" keepend contains=pythonFuncCallName,pythonFuncCallArgs
+syn region pythonFuncCall start="[a-zA-Z_][a-zA-Z0-9_]*(" end=")" contains=pythonFuncCallName,pythonFuncCallArgs
 syn match pythonFuncCallName "[a-zA-Z_][a-zA-Z0-9_]*" display contained nextgroup=pythonFuncCallArgs skipwhite
-syn region pythonFuncCallArgs start="("ms=s+1 end=")"me=e-1 contained contains=@pythonStringType,@pythonNumberType,@pythonBuiltin,pythonFuncCallKwargs
+syn region pythonFuncCallArgs start="("ms=s+1 end=")"me=e-1 contained contains=pythonFuncCall,@pythonStringType,@pythonNumberType,@pythonBuiltin,pythonFuncCallKwargs
 
 syn match pythonFuncCallKwargs "[a-zA-Z_][a-zA-Z0-9_]*\s*=" display contained contains=pythonKey,pythonKeyAssign
 syn match pythonKey "[a-zA-Z_][a-zA-Z0-9_]*" display contained nextgroup=pythonKeyAssign skipwhite
@@ -255,8 +261,10 @@ if exists("python_highlight_string_templates") && python_highlight_string_templa
   syn match pythonStrTemplate	"\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
 endif
 
-syn region pythonDocTest	start="^\s*>>>" end=+'''+he=s-1 end="^\s*$" contained
-syn region pythonDocTest2	start="^\s*>>>" end=+"""+he=s-1 end="^\s*$" contained
+if exists("python_highlight_doctests") && python_highlight_doctests != 0
+  syn region pythonDocTest	start="^\s*>>>" end=+'''+he=s-1 end="^\s*$" contained
+  syn region pythonDocTest2	start="^\s*>>>" end=+"""+he=s-1 end="^\s*$" contained
+endif
 
 " Numbers (ints, longs, floats, complex)
 syn match   pythonHexError	"\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display
