--- python.vim-2.6.3	2008-12-22 16:14:03.000000000 -0800
+++ python.vim	2008-12-22 22:37:02.000000000 -0800
@@ -69,6 +69,9 @@
   finish
 endif
 
+let python_highlight_all = 1
+
+
 if exists("python_highlight_all") && python_highlight_all != 0
   " Not override previously set options
   if !exists("python_highlight_builtins")
@@ -121,9 +124,25 @@
 
 " Comments
 syn match   pythonComment	"#.*$" display contains=pythonTodo,@Spell
+
+syn match   pythonCommentedCode	"##\w.*$" display
+syn match   pythonKingComment	"### .*$" display
+syn match   pythonMajorSection	"####*$" display
+syn match   pythonMinorSection	"#---*$" display
+syn match   pythonSmartComment	"###\w.*$" display
+"syn match   pythonInfoComment	"#\s\w.*$" display
+syn match   pythonDisabledComment	"#\w.*$" display
+syn match   pythonJavadoc	" \+@\w\+:" display
+syn match   pythonEpydoc	" \+:\w\+:" display
+
+"syn region  pythonEolComment start="\w.* \+# \w.*$" end="$" display excludenl
+
 syn match   pythonRun		"\%^#!.*$"
 syn match   pythonCoding	"\%^.*\(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$"
-syn keyword pythonTodo		TODO FIXME XXX contained
+" Support for Codetags (PEP 350)
+syn keyword pythonTodo     TODO FIXME RFE QSTN HACK FAQ SEE STAT RVDBY WKRD XXX ??? BUG REQ GLOSS FTRQ CAV IDEA NOTE PORT CRED WARN WARNING contained
+" Code that has been disabled.
+
 
 " Errors
 syn match pythonError		"\<\d\+\D\+\>" display
@@ -145,8 +164,8 @@
 " Strings
 syn region pythonString		start=+[bB]\='+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell
 syn region pythonString		start=+[bB]\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell
-syn region pythonString		start=+[bB]\="""+ end=+"""+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest2,pythonSpaceError,@Spell
-syn region pythonString		start=+[bB]\='''+ end=+'''+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest,pythonSpaceError,@Spell
+syn region pythonTripleDirkString		start=+[bB]\="""+ end=+"""+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest2,pythonSpaceError,pythonJavadoc,pythonEpydoc,@Spell
+syn region pythonTripleTickString		start=+[bB]\='''+ end=+'''+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest,pythonSpaceError,@Spell
 
 syn match  pythonEscape		+\\[abfnrtv'"\\]+ display contained
 syn match  pythonEscape		"\\\o\o\=\o\=" display contained
@@ -193,8 +212,8 @@
 
 if exists("python_highlight_string_format") && python_highlight_string_format != 0
   " str.format syntax
-  syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
-  syn match pythonStrFormat	"{\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rs]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+  syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonTripleDirkString,pythonTripleTickString,pythonUniString,pythonRawString,pythonUniRawString
+  syn match pythonStrFormat	"{\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rs]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonTripleDirkString,pythonTripleTickString,pythonUniString,pythonRawString,pythonUniRawString
 endif
 
 if exists("python_highlight_string_templates") && python_highlight_string_templates != 0
@@ -314,6 +333,8 @@
   HiLink pythonSpaceError	Error
 
   HiLink pythonString		String
+  HiLink pythonTripleDirkString		String
+  HiLink pythonTripleTickString		String
   HiLink pythonUniString	String
   HiLink pythonRawString	String
   HiLink pythonUniRawString	String