Merge branch 'async_def_fix'

CHANGES.txt

@@ -1,3 +1,7 @@
+Revision 3.6.0 (2015-11-XX):
+
+    - Fix 'async def' highlighting. Patch by Joongi Kim
+
 Revision 3.5.0 (2015-06-10):
 
     - Add support for 'async ...' and 'await' keywords introduced in

README.rst

@@ -138,6 +138,7 @@ List of the contributors in alphabetical order:
 - `Ihor Gorobets <https://github.com/iho>`_
 - `Jeroen Ruigrok van der Werven <https://github.com/ashemedai>`_
 - `John Eikenberry <https://github.com/eikenb>`_
+- `Joongi Kim <https://github.com/achimnol>`_
 - `Marc Weber <https://github.com/MarcWeber>`_
 - `Pedro Algarvio <https://github.com/s0undt3ch>`_
 - `Victor Salgado <https://github.com/mcsalgado>`_

syntax/python.vim

@@ -31,6 +31,7 @@
 "   Ihor Gorobets
 "   Jeroen Ruigrok van der Werven
 "   John Eikenberry
+"   Joongi Kim
 "   Marc Weber
 "   Pedro Algarvio
 "   Victor Salgado
@@ -176,10 +177,9 @@ else
   syn keyword pythonBoolean     True False
   syn match   pythonFunction    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
   syn keyword pythonStatement   await
-  syn match   pythonStatement   "\<async\s\+def\>" display
+  syn match   pythonStatement   "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
   syn match   pythonStatement   "\<async\s\+with\>" display
   syn match   pythonStatement   "\<async\s\+for\>" display
-  syn match   pythonStatement   "\<async\s\+with\>" display
 endif
 
 "

test.py

@@ -18,6 +18,11 @@ class Classname
 def функция
 class Класс
 
+await
+async def Test
+async with
+async for
+
 # Builtin objects.
 
 True False Ellipsis None NotImplemented