diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-14 06:57:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-14 06:57:19 (GMT) |
| commit | 357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6 (patch) | |
| tree | 494aaff8a38b7d71c9b23b8c4176b27de433e3fb | |
| parent | b661a4bc1e172a9c67bf62bdc2715bd4efbc16e5 (diff) | |
| parent | 37e7793d473019eac69c347f1a79e3273567b9bf (diff) | |
| download | git-357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6.zip git-357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6.tar.gz git-357ba5cf0d4c77c6b4ad8d2cc604392687a3e2a6.tar.bz2 | |
Merge branch 'tr/userdiff-c-returns-pointer'
* tr/userdiff-c-returns-pointer:
userdiff: allow * between cpp funcname words
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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)[^;]*)$", /* -- */ |