diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-31 13:53:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-31 13:53:09 (GMT) |
commit | 8ceb1793749218eb303f45beb0f3632594a8c5b6 (patch) | |
tree | 00ee4133aa4ab29f6d7cd1c70dd91406f32267e4 /src | |
parent | 06b424be8e527dd6d4d09c11addab37c6b638305 (diff) | |
parent | 31a668c8c8ad29119158b140c34f67940dfeb7ed (diff) | |
download | Doxygen-8ceb1793749218eb303f45beb0f3632594a8c5b6.zip Doxygen-8ceb1793749218eb303f45beb0f3632594a8c5b6.tar.gz Doxygen-8ceb1793749218eb303f45beb0f3632594a8c5b6.tar.bz2 |
Merge pull request #7017 from albert-github/feature/bug_rcs_perl
Conflict between RCS tag and (e.g.) php description
Diffstat (limited to 'src')
-rw-r--r-- | src/doctokenizer.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index b829fc9..5346c0a 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -658,7 +658,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->isEMailAddr=TRUE; return TK_URL; } -<St_Para>"$"{ID}":"[^\n$]+"$" { /* RCS tag */ +<St_Para>"$"{ID}":"[^:\n$][^\n$]*"$" { /* RCS tag */ QCString tagName(yytext+1); int index=tagName.find(':'); g_token->name = tagName.left(index); |