Skip to content

Commit d02a048

Browse files
committed
Merge branch 'dummy_python_include_group'
2 parents 299d33b + ad932f5 commit d02a048

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Revision 3.6.0 (2015-11-XX):
22

33
- Fix 'async def' highlighting. Patch by Joongi Kim
4+
- Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim.
5+
Patch by Antony Lee
46

57
Revision 3.5.0 (2015-06-10):
68

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ List of the contributors in alphabetical order:
132132

133133
- `Andrea Riciputi <https://github.com/mrrech>`_
134134
- Anton Butanaev
135+
- `Antony Lee <https://github.com/anntzer>`_
135136
- Caleb Adamantine
136137
- `David Briscoe <https://github.com/idbrii>`_
137138
- `Elizabeth Myers <https://github.com/Elizafox>`_

syntax/python.vim

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"
2626
" Andrea Riciputi
2727
" Anton Butanaev
28+
" Antony Lee
2829
" Caleb Adamantine
2930
" David Briscoe
3031
" Elizabeth Myers
@@ -158,6 +159,9 @@ syn keyword pythonStatement with
158159
syn keyword pythonStatement def class nextgroup=pythonFunction skipwhite
159160
syn keyword pythonRepeat for while
160161
syn keyword pythonConditional if elif else
162+
" The standard pyrex.vim unconditionally removes the pythonInclude group, so
163+
" we provide a dummy group here to avoid crashing pyrex.vim.
164+
syn keyword pythonInclude import
161165
syn keyword pythonImport import
162166
syn keyword pythonException try except finally
163167
syn keyword pythonOperator and in is not or

0 commit comments

Comments
 (0)