From ac2ab0075f3bd2da55b9eb003f12455ca981df21 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 16 Jun 2016 16:59:09 +0000
Subject: Improve fix and add test.

---
 generic/tclCompile.c |  7 ++-----
 tests/info.test      | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 8cdd9d2..31e69ad 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -2602,12 +2602,9 @@ EnterCmdWordData(
         TclAdvanceLines         (&wordLine, last, tokenPtr->start);
 	TclAdvanceContinuations (&wordLine, &wordNext,
 				 tokenPtr->start - envPtr->source);
-#if 0
 	wwlines[wordIdx] =
-		(TclWordKnownAtCompileTime(tokenPtr, NULL) ? wordLine : -1);
-#else
-	wwlines[wordIdx] = wordLine;
-#endif
+		((wordIdx == 0) || TclWordKnownAtCompileTime(tokenPtr, NULL))
+		? wordLine : -1;
 	ePtr->line[wordIdx] = wordLine;
 	ePtr->next[wordIdx] = wordNext;
 	last = tokenPtr->start;
diff --git a/tests/info.test b/tests/info.test
index 937da8c..d30bf9a 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -1818,6 +1818,23 @@ test info-38.2 {location information for uplevel, dl, direct-literal} -match glo
 * {type source line 1814 file info.test cmd etrace level 1}
 * {type source line 1812 file info.test cmd uplevel\\ \\\\ level 1}} -cleanup {interp delete sub}
 
+test info-39.0 {Bug 4b61afd660} -setup {
+    proc probe {} {
+	return [dict get [info frame -1] line]
+    }
+    set body {
+	set cmd probe
+	$cmd
+    }
+    proc demo {} $body
+} -body {
+    demo
+} -cleanup {
+    unset -nocomplain body
+    rename demo {}
+    rename probe {}
+} -result 3
+
 # cleanup
 catch {namespace delete test_ns_info1 test_ns_info2}
 ::tcltest::cleanupTests
-- 
cgit v0.12