Browse Source

Merge branch 'dummy_python_include_group'

Dmitry Vasiliev 3 years ago
parent
commit
d02a048f73
3 changed files with 7 additions and 0 deletions
  1. 2
    0
      CHANGES.txt
  2. 1
    0
      README.rst
  3. 4
    0
      syntax/python.vim

+ 2
- 0
CHANGES.txt View File

@@ -1,6 +1,8 @@
1 1
 Revision 3.6.0 (2015-11-XX):
2 2
 
3 3
     - Fix 'async def' highlighting. Patch by Joongi Kim
4
+    - Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim.
5
+      Patch by Antony Lee
4 6
 
5 7
 Revision 3.5.0 (2015-06-10):
6 8
 

+ 1
- 0
README.rst View File

@@ -132,6 +132,7 @@ List of the contributors in alphabetical order:
132 132
 
133 133
 - `Andrea Riciputi <https://github.com/mrrech>`_
134 134
 - Anton Butanaev
135
+- `Antony Lee <https://github.com/anntzer>`_
135 136
 - Caleb Adamantine
136 137
 - `David Briscoe <https://github.com/idbrii>`_
137 138
 - `Elizabeth Myers <https://github.com/Elizafox>`_

+ 4
- 0
syntax/python.vim View File

@@ -25,6 +25,7 @@
25 25
 "
26 26
 "   Andrea Riciputi
27 27
 "   Anton Butanaev
28
+"   Antony Lee
28 29
 "   Caleb Adamantine
29 30
 "   David Briscoe
30 31
 "   Elizabeth Myers
@@ -158,6 +159,9 @@ syn keyword pythonStatement     with
158 159
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
159 160
 syn keyword pythonRepeat        for while
160 161
 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
161 165
 syn keyword pythonImport        import
162 166
 syn keyword pythonException     try except finally
163 167
 syn keyword pythonOperator      and in is not or