summaryrefslogtreecommitdiff
path: root/runtime/syntax/python.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/syntax/python.vim')
-rw-r--r--runtime/syntax/python.vim8
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 52873e977..2e387421d 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -52,6 +52,9 @@ syn keyword pythonPreCondit import from as
syn match pythonComment "#.*$" contains=pythonTodo
syn keyword pythonTodo TODO FIXME XXX contained
+" Decorators (new in Python 2.4)
+syn match pythonDecorator "@" display nextgroup=pythonFunction skipwhite
+
" strings
syn region pythonString matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape
syn region pythonString matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape
@@ -85,6 +88,8 @@ endif
if exists("python_highlight_builtins")
" builtin functions, types and objects, not really part of the syntax
+ syn keyword pythonBuiltin True False bool enumerate set frozenset help
+ syn keyword pythonBuiltin reversed sorted sum
syn keyword pythonBuiltin Ellipsis None NotImplemented __import__ abs
syn keyword pythonBuiltin apply buffer callable chr classmethod cmp
syn keyword pythonBuiltin coerce compile complex delattr dict dir divmod
@@ -110,6 +115,8 @@ if exists("python_highlight_exceptions")
syn keyword pythonException StandardError StopIteration SyntaxError
syn keyword pythonException SyntaxWarning SystemError SystemExit TabError
syn keyword pythonException TypeError UnboundLocalError UnicodeError
+ syn keyword pythonException UnicodeEncodeError UnicodeDecodeError
+ syn keyword pythonException UnicodeTranslateError
syn keyword pythonException UserWarning ValueError Warning WindowsError
syn keyword pythonException ZeroDivisionError
endif
@@ -151,6 +158,7 @@ if version >= 508 || !exists("did_python_syn_inits")
HiLink pythonPreCondit PreCondit
HiLink pythonComment Comment
HiLink pythonTodo Todo
+ HiLink pythonDecorator Define
if exists("python_highlight_numbers")
HiLink pythonNumber Number
endif