summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-05 20:52:44 (GMT)
commit9502b616f187c567b93db69cd9c6f0028019bd15 (patch)
tree63c35ad83af6ad1ddc1059ce5132698d8e771530 /userdiff.c
parent76c68246c6b9752fd692f84b928cf867befd57cc (diff)
parent077a1fda82b237c16eb10bd988650468683a94b5 (diff)
downloadgit-9502b616f187c567b93db69cd9c6f0028019bd15.zip
git-9502b616f187c567b93db69cd9c6f0028019bd15.tar.gz
git-9502b616f187c567b93db69cd9c6f0028019bd15.tar.bz2
Merge branch 'jh/userdiff-python-async'
The userdiff machinery has been taught that "async def" is another way to begin a "function" in Python. * jh/userdiff-python-async: userdiff: support Python async functions
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c
index 577053c..324916f 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -145,7 +145,7 @@ PATTERNS("php",
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
"|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"),
-PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$",
+PATTERNS("python", "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?"