瀏覽代碼

Merge branch 'dummy_python_include_group'

Dmitry Vasiliev 9 年之前
父節點
當前提交
d02a048f73
共有 3 個文件被更改,包括 7 次插入0 次删除
  1. 2
    0
      CHANGES.txt
  2. 1
    0
      README.rst
  3. 4
    0
      syntax/python.vim

+ 2
- 0
CHANGES.txt 查看文件

1
 Revision 3.6.0 (2015-11-XX):
1
 Revision 3.6.0 (2015-11-XX):
2
 
2
 
3
     - Fix 'async def' highlighting. Patch by Joongi Kim
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
 Revision 3.5.0 (2015-06-10):
7
 Revision 3.5.0 (2015-06-10):
6
 
8
 

+ 1
- 0
README.rst 查看文件

132
 
132
 
133
 - `Andrea Riciputi <https://github.com/mrrech>`_
133
 - `Andrea Riciputi <https://github.com/mrrech>`_
134
 - Anton Butanaev
134
 - Anton Butanaev
135
+- `Antony Lee <https://github.com/anntzer>`_
135
 - Caleb Adamantine
136
 - Caleb Adamantine
136
 - `David Briscoe <https://github.com/idbrii>`_
137
 - `David Briscoe <https://github.com/idbrii>`_
137
 - `Elizabeth Myers <https://github.com/Elizafox>`_
138
 - `Elizabeth Myers <https://github.com/Elizafox>`_

+ 4
- 0
syntax/python.vim 查看文件

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