Junio C Hamano <gitster <at> pobox.com> writes:
>
> Vadim Zeitlin <vz-git <at> zeitlins.org> writes:
...
> > diff --git a/userdiff.c b/userdiff.c
> > index ea43a03..9415586 100644
> > --- a/userdiff.c
> > +++ b/userdiff.c
> > @@ -125,7 +125,7 @@ PATTERNS("tex",
> > "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
> > "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
> > PATTERNS("cpp",
> > /* Jump targets or access declarations */
> > - "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n"
> > + "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:([^:].*$|$)\n"
>
> Hmm. Wouldn't "find a word (possibly after indentation), colon and
> then either a non-colon or end of line" be sufficient and simpler?
> iow, something like...
>
> "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:([^:]|$)"
This works too, of course. I didn't know why did the original regex
contain ".*$" part so I decided to keep it but your version is indeed
how I would have written it myself if I were doing it from scratch.
Should I resubmit an updated patch or could you please just apply
your version?
TIA!
VZ
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html