summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-10-09 08:04:33 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-10-09 08:04:33 (GMT)
commit8a48f6c3f4827171edf41a40bfdbc03e53d9be6b (patch)
treefac3e1fdcea37381cbfa5042e20155883cf97372 /src/commentscan.l
parent6dbef217c477d43fb61e90b429531ee109bf0e75 (diff)
downloadDoxygen-8a48f6c3f4827171edf41a40bfdbc03e53d9be6b.zip
Doxygen-8a48f6c3f4827171edf41a40bfdbc03e53d9be6b.tar.gz
Doxygen-8a48f6c3f4827171edf41a40bfdbc03e53d9be6b.tar.bz2
Release-1.7.2
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index d4f7f0e..5926d7c 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -211,7 +211,7 @@ static DocCmdMap docCmdMap[] =
{ "copydetails", 0, TRUE },
{ "date", 0, TRUE },
{ "dotfile", 0, TRUE },
- { "htmlinclude", 0, TRUE },
+ { "htmlinclude", 0, FALSE },
{ "image", 0, TRUE },
{ "include", 0, TRUE },
{ "includelineno", 0, TRUE },
@@ -236,7 +236,7 @@ static DocCmdMap docCmdMap[] =
{ "throw", 0, TRUE },
{ "throws", 0, TRUE },
{ "until", 0, TRUE },
- { "verbinclude", 0, TRUE },
+ { "verbinclude", 0, FALSE },
{ "version", 0, TRUE },
{ "warning", 0, TRUE },
{ 0, 0, FALSE }
@@ -720,6 +720,7 @@ static inline void setOutput(OutputContext ctx)
else
{
pOutputString = &current->doc;
+ inContext = OutputDoc; // need to switch to detailed docs, see bug 631380
}
break;
case OutputXRef:
@@ -2556,7 +2557,7 @@ bool parseCommentBlock(/* in */ ParserInterface *parser,
newEntryNeeded = needNewEntry;
// if we did not proceed during this call, it does not make
- // sence to continue, since we get stuck. See bug 567346 for situations
+ // sense to continue, since we get stuck. See bug 567346 for situations
// were this happens
if (parseMore && position==inputPosition) parseMore=FALSE;