mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'tr/userdiff-c-returns-pointer'
* tr/userdiff-c-returns-pointer: userdiff: allow * between cpp funcname words
This commit is contained in:
commit
357ba5cf0d
|
@ -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)[^;]*)$",
|
||||
/* -- */
|
||||
|
|
Loading…
Reference in a new issue