diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-21 11:42:45 -0800 |
| commit | f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517 (patch) | |
| tree | 075ca6795fc65ac88b949dde126a4ec3d0056ef1 | |
| parent | 406cc9b822b44a1d53c1a45536460992529aec88 (diff) | |
| parent | 37e7793d473019eac69c347f1a79e3273567b9bf (diff) | |
| download | git-f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517.tar.gz | |
Merge branch 'tr/userdiff-c-returns-pointer' into maint
* tr/userdiff-c-returns-pointer:
userdiff: allow * between cpp funcname words
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index bf553ad91b..7244aac746 100644 --- a/userdiff.c +++ b/userdiff.c @@ -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)[^;]*)$", /* -- */ |