Merge branch 'tr/userdiff-c-returns-pointer'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:57:19 +0000 (22:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 06:57:19 +0000 (22:57 -0800)
* tr/userdiff-c-returns-pointer:
  userdiff: allow * between cpp funcname words

userdiff.c

index 7c983c1..76109da 100644 (file)
@@ -118,7 +118,7 @@ PATTERNS("cpp",
         /* Jump targets or access declarations */
         "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n"
         /* C/++ functions/methods at top level */
-        "^([A-Za-z_][A-Za-z_0-9]*([ \t]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n"
+        "^([A-Za-z_][A-Za-z_0-9]*([ \t*]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n"
         /* compound type at top level */
         "^((struct|class|enum)[^;]*)$",
         /* -- */