diff --git a/CHANGES.txt b/CHANGES.txt index 4a555dc..2d3b520 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ Revision 3.6.0 (2015-11-XX): - Fix 'async def' highlighting. Patch by Joongi Kim + - Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim. + Patch by Antony Lee Revision 3.5.0 (2015-06-10): diff --git a/README.rst b/README.rst index a45e330..f9cd20d 100644 --- a/README.rst +++ b/README.rst @@ -132,6 +132,7 @@ List of the contributors in alphabetical order: - `Andrea Riciputi `_ - Anton Butanaev +- `Antony Lee `_ - Caleb Adamantine - `David Briscoe `_ - `Elizabeth Myers `_ diff --git a/syntax/python.vim b/syntax/python.vim index fe42075..f19a12c 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -25,6 +25,7 @@ " " Andrea Riciputi " Anton Butanaev +" Antony Lee " Caleb Adamantine " David Briscoe " Elizabeth Myers @@ -158,6 +159,9 @@ syn keyword pythonStatement with syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite syn keyword pythonRepeat for while syn keyword pythonConditional if elif else +" The standard pyrex.vim unconditionally removes the pythonInclude group, so +" we provide a dummy group here to avoid crashing pyrex.vim. +syn keyword pythonInclude import syn keyword pythonImport import syn keyword pythonException try except finally syn keyword pythonOperator and in is not or