summaryrefslogtreecommitdiffstats
path: root/generic/tclCompile.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-06-17 00:53:04 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-06-17 00:53:04 (GMT)
commit5f37ca27b1c063da4d683acdadc4ac1e458fa543 (patch)
treeedceb0c6951153cfff0e2f2ee9a653ecae86314e /generic/tclCompile.c
parentd5ee2656ca67c1e5b1bd7a57a84a51f9dc22bcca (diff)
parent8824470ed0704024b804da2d301cf0d05a63ee04 (diff)
downloadtcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.zip
tcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.tar.gz
tcl-5f37ca27b1c063da4d683acdadc4ac1e458fa543.tar.bz2
merge 8.6
Diffstat (limited to 'generic/tclCompile.c')
-rw-r--r--generic/tclCompile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index c0b5dcc..c0203dd 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -3239,8 +3239,10 @@ EnterCmdWordData(
TclAdvanceLines(&wordLine, last, tokenPtr->start);
TclAdvanceContinuations(&wordLine, &wordNext,
tokenPtr->start - envPtr->source);
+ /* See Ticket 4b61afd660 */
wwlines[wordIdx] =
- (TclWordKnownAtCompileTime(tokenPtr, NULL) ? wordLine : -1);
+ ((wordIdx == 0) || TclWordKnownAtCompileTime(tokenPtr, NULL))
+ ? wordLine : -1;
ePtr->line[wordIdx] = wordLine;
ePtr->next[wordIdx] = wordNext;
last = tokenPtr->start;