userdiff: improve Fortran xfuncname regex

The third part of the Fortran xfuncname regex wants to match the
beginning of a subroutine or function, so it allows for all characters
except `'`, `"` or whitespace before the keyword 'function' or
'subroutine'. This is meant to match the 'recursive', 'elemental' or
'pure' keywords, as well as function return types, and to prevent
matches inside strings.

However, the negated set does not contain the `!` comment character,
so a line with an end-of-line comment containing the keyword 'function' or
'subroutine' followed by another word is mistakenly chosen as a hunk header.

Improve the regex by adding `!` to the negated set.

Signed-off-by: Philippe Blain <>
Signed-off-by: Junio C Hamano <>
This commit is contained in:
Philippe Blain 2020-08-12 22:30:29 +00:00 committed by Junio C Hamano
parent b79e6925f0
commit 75c3b6b2e8
2 changed files with 1 additions and 2 deletions

View File

@ -8,7 +8,6 @@
real funcB ! grid function b
real ChangeMe
integer broken
end subroutine RIGHT

View File

@ -53,7 +53,7 @@ IPATTERN("fortran",
/* Program, module, block data */
"^[ \t]*((END[ \t]+)?(PROGRAM|MODULE|BLOCK[ \t]+DATA"
/* Subroutines and functions */
"|([^'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
"|([^!'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
/* -- */