Skip to content

Commit

Permalink
Merge branch 'tr/userdiff-c-returns-pointer' into maint
Browse files Browse the repository at this point in the history
* tr/userdiff-c-returns-pointer:
  userdiff: allow * between cpp funcname words
  • Loading branch information
Junio C Hamano committed Dec 21, 2011
2 parents 406cc9b + 37e7793 commit f0b4fd4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion userdiff.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,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)[^;]*)$",
/* -- */
Expand Down

0 comments on commit f0b4fd4

Please sign in to comment.