Browse Source

Merge 9ccbd6196b893fb3f094de9667828ad556a8cf67 into 6f6f10ff5408182f1d8ff1af26058e80c5dfa9cd

pydave 11 years ago
parent
commit
e173a02685
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      syntax/python.vim

+ 3
- 3
syntax/python.vim View File

149
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
149
 syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
150
 syn keyword pythonRepeat        for while
150
 syn keyword pythonRepeat        for while
151
 syn keyword pythonConditional   if elif else
151
 syn keyword pythonConditional   if elif else
152
-syn keyword pythonPreCondit     import from
152
+syn keyword pythonImport        import from
153
 syn keyword pythonException     try except finally
153
 syn keyword pythonException     try except finally
154
 syn keyword pythonOperator      and in is not or
154
 syn keyword pythonOperator      and in is not or
155
 
155
 
157
   if !s:Enabled("g:python_print_as_function")
157
   if !s:Enabled("g:python_print_as_function")
158
     syn keyword pythonStatement  print
158
     syn keyword pythonStatement  print
159
   endif
159
   endif
160
-  syn keyword pythonPreCondit   as
160
+  syn keyword pythonImport      as
161
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" display contained
161
   syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" display contained
162
 else
162
 else
163
   syn keyword pythonStatement   as nonlocal None
163
   syn keyword pythonStatement   as nonlocal None
469
   endif
469
   endif
470
 
470
 
471
   HiLink pythonStatement        Statement
471
   HiLink pythonStatement        Statement
472
-  HiLink pythonPreCondit        Statement
472
+  HiLink pythonImport           Include
473
   HiLink pythonFunction         Function
473
   HiLink pythonFunction         Function
474
   HiLink pythonConditional      Conditional
474
   HiLink pythonConditional      Conditional
475
   HiLink pythonRepeat           Repeat
475
   HiLink pythonRepeat           Repeat